diff --git a/.dockerignore b/.dockerignore
index 0f6ad06..2339969 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,11 +1,4 @@
-server/.env
-server/dist
-server/node_modules
-
-client/.env
-client/build
-client/node_modules
-
-judge/.env
-judge/dist
-judge/node_modules
+**/*/.env
+**/*/dist
+**/*/build
+**/*/node_modules
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 27ef19d..d06611d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -19,6 +19,9 @@ jobs:
       - name: Yarn Install
         run: yarn install
 
+      - name: Lint
+        run: yarn lint
+
       - name: Prettier
         run: yarn prettier
 
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..ea9ebdb
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "printWidth": 100,
+  "singleQuote": true
+}
\ No newline at end of file
diff --git a/.run/client_start.run.xml b/.run/client_start.run.xml
new file mode 100644
index 0000000..95f39c3
--- /dev/null
+++ b/.run/client_start.run.xml
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="client:start" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/projects/client/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs>
+      <env name="HOST" value="localhost" />
+    </envs>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/judge_start.run.xml b/.run/judge_start.run.xml
new file mode 100644
index 0000000..d9ca1d6
--- /dev/null
+++ b/.run/judge_start.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="judge:start" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/projects/judge/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start:dev" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/server_start.run.xml b/.run/server_start.run.xml
new file mode 100644
index 0000000..bd29240
--- /dev/null
+++ b/.run/server_start.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="server:start" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/projects/server/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start:dev" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/client/.prettierrc b/client/.prettierrc
deleted file mode 100644
index 637b3a7..0000000
--- a/client/.prettierrc
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "printWidth": 100,
-  "tabWidth": 2,
-  "useTabs": false,
-  "semi": true,
-  "singleQuote": true,
-  "quoteProps": "as-needed",
-  "trailingComma": "all",
-  "bracketSpacing": true,
-  "arrowParens": "always",
-  "endOfLine": "lf"
-}
\ No newline at end of file
diff --git a/client/src/core/stores/ClarificationsStore.ts b/client/src/core/stores/ClarificationsStore.ts
deleted file mode 100644
index 769af58..0000000
--- a/client/src/core/stores/ClarificationsStore.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { action, observable } from 'mobx';
-import { Clarification } from '../models';
-import http from '../utils/http-client';
-import { RootStore } from './RootStore';
-
-export class ClarificationsStore {
-  @observable data: Clarification[] = [];
-  @observable item: Clarification = { messages: [] } as any;
-
-  constructor(private readonly rootStore: RootStore) {}
-
-  @action
-  setItem = (item: Clarification): void => {
-    this.item = item;
-  };
-
-  @action
-  fetchAllForTeam = async (contestId: number, teamId: number): Promise<Clarification[]> => {
-    return (this.data = await http.get(`api/contests/${contestId}/team/${teamId}/clarifications`));
-  };
-
-  @action
-  sendClarification = async (
-    contestId: number,
-    clarification: Clarification,
-  ): Promise<Clarification> => {
-    return (this.item = await http.post<Clarification>(
-      `api/contests/${contestId}/clarifications`,
-      clarification,
-    ));
-  };
-}
diff --git a/client/src/pages/admin/AdminNavbar.tsx b/client/src/pages/admin/AdminNavbar.tsx
deleted file mode 100644
index 1fb1835..0000000
--- a/client/src/pages/admin/AdminNavbar.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Menu } from '@headlessui/react';
-import { LogoutIcon, UserIcon, ViewListIcon } from '@heroicons/react/outline';
-import { observer } from 'mobx-react';
-import React from 'react';
-import { useHistory } from 'react-router-dom';
-import { rootStore } from '../../core/stores/RootStore';
-import ActiveContestSelector from '../shared/ActiveContestSelector';
-import { DarkModeSwitcher } from '../shared/DarkModeSwitcher';
-
-type AdminNavbarProps = { toggleSidebar: () => void };
-
-const AdminNavbar: React.FC<AdminNavbarProps> = observer(({ toggleSidebar }) => {
-  const history = useHistory();
-  const { profile } = rootStore;
-
-  return (
-    <div className="select-none p-1 px-3 text-black bg-white shadow rounded-md border flex items-center w-full justify-between dark:text-white dark:bg-gray-800 dark:border-gray-700">
-      <ViewListIcon className="h-6 w-6 cursor-pointer" onClick={toggleSidebar} />
-      <div className="flex items-center gap-2">
-        <ActiveContestSelector className="p-2 rounded-md hover:bg-gray-200 dark:hover:bg-gray-700" />
-        <Menu as="div" className="relative">
-          <Menu.Button
-            as="div"
-            className="flex items-center justify-center gap-1 p-2 rounded-md cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-700"
-          >
-            <UserIcon className="h-4 w-4" />
-            {profile?.name ?? '-'}
-          </Menu.Button>
-          <Menu.Items className="absolute z-50 transform left-1/2 -translate-x-1/2 w-36 mt-4 p-2 gap-2 border bg-white rounded-md shadow-lg outline-none dark:bg-gray-800 dark:border-gray-700">
-            <Menu.Item onClick={() => history.push('/logout')}>
-              <div className="flex items-center gap-1 px-3 py-2 cursor-pointer rounded-md hover:bg-gray-200 dark:hover:bg-gray-700">
-                <LogoutIcon className="h-4 w-4" />
-                Logout
-              </div>
-            </Menu.Item>
-          </Menu.Items>
-        </Menu>
-        <DarkModeSwitcher />
-      </div>
-    </div>
-  );
-});
-
-export default AdminNavbar;
diff --git a/client/src/pages/admin/views/clarifications/ClarificationsList.tsx b/client/src/pages/admin/views/clarifications/ClarificationsList.tsx
deleted file mode 100644
index 223b575..0000000
--- a/client/src/pages/admin/views/clarifications/ClarificationsList.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { RefreshIcon } from '@heroicons/react/solid';
-import { observer } from 'mobx-react';
-import React from 'react';
-
-const ClarificationsList: React.FC = observer(() => {
-  return (
-    <div className="dark:text-white">
-      <div className="flex items-center shadow rounded-md border w-full justify-between px-4 py-2 bg-white dark:bg-gray-800 dark:border-gray-700">
-        <div className="text-xl font-medium">Clarifications</div>
-        <div className="flex items-center space-x-2">
-          <div className="hover:bg-gray-200 rounded-md p-2 cursor-pointer">
-            <RefreshIcon className="w-6 h-6" />
-          </div>
-        </div>
-      </div>
-      {/*<Grid style={{ height: '87vh' }}>*/}
-      {/*  <Grid.Column width="3" style={{ paddingRight: 0 }}>*/}
-      {/*    <Menu vertical fluid>*/}
-      {/*      <Menu.Item active name="home" />*/}
-      {/*      <Menu.Item name="messages" />*/}
-      {/*      <Menu.Item name="friends" />*/}
-      {/*    </Menu>*/}
-      {/*  </Grid.Column>*/}
-      {/*  <Grid.Column width="13" stretched></Grid.Column>*/}
-      {/*</Grid>*/}
-    </div>
-  );
-});
-
-export default ClarificationsList;
diff --git a/client/src/pages/admin/views/problems/ProblemView.tsx b/client/src/pages/admin/views/problems/ProblemView.tsx
deleted file mode 100644
index 61704e3..0000000
--- a/client/src/pages/admin/views/problems/ProblemView.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { observer } from 'mobx-react';
-import React, { useEffect } from 'react';
-import { RouteChildrenProps } from 'react-router-dom';
-import { Problem } from '../../../../core/models';
-import { rootStore } from '../../../../core/stores/RootStore';
-import Spinner from '../../../shared/Spinner';
-import TestcasesList from './testcases/TestcasesList';
-
-const ProblemView: React.FC<RouteChildrenProps<{ id?: string }>> = observer(({ match }) => {
-  const {
-    problemsStore: { item, fetchById, rejudge },
-  } = rootStore;
-
-  useEffect(() => {
-    fetchById(parseInt(match!.params.id!)).catch(() => location.assign('/'));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [fetchById]);
-
-  return !item.id ? (
-    <Spinner className="rounded-md border shadow dark:border-gray-700" />
-  ) : (
-    <div className="grid grid-cols-2 gap-4 overflow-hidden h-full dark:text-white">
-      <div className="flex flex-col gap-y-4 overflow-hidden">
-        <div className="bg-white divide-y border shadow rounded-md dark:bg-gray-800 dark:border-gray-700 dark:divide-gray-700">
-          <div className="flex p-3 items-center justify-between">
-            <div className="text-lg font-medium">{`Problem '${item.name}'`}</div>
-            <div
-              className="text-white p-2 px-3 bg-blue-500 hover:bg-blue-400 rounded cursor-pointer"
-              onClick={() => rejudge(item.id!)}
-            >
-              Rejudge
-            </div>
-          </div>
-          <div className="p-4">
-            <div className="border rounded-md dark:border-gray-700">
-              <table className="min-w-full">
-                <tbody className="divide-y dark:divide-gray-700">
-                  <tr className="divide-x dark:divide-gray-700">
-                    <td className="p-2">ID</td>
-                    <td className="p-2">{item.id}</td>
-                  </tr>
-                  <tr className="divide-x bg-gray-100 dark:bg-gray-700 dark:divide-gray-800">
-                    <td className="p-2">Name</td>
-                    <td className="p-2">{item.name}</td>
-                  </tr>
-                  <tr className="divide-x dark:divide-gray-700">
-                    <td className="p-2">Time limit</td>
-                    <td className="p-2">{item.timeLimit} s</td>
-                  </tr>
-                  <tr className="divide-x bg-gray-100 dark:bg-gray-700 dark:divide-gray-800">
-                    <td className="p-2">Memory limit</td>
-                    <td className="p-2">{item.memoryLimit} Kb</td>
-                  </tr>
-                  <tr className="divide-x dark:divide-gray-700">
-                    <td className="p-2">Output limit</td>
-                    <td className="p-2">{item.outputLimit} Kb</td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-          </div>
-        </div>
-        <TestcasesList problem={item as Problem} />
-      </div>
-      <div className="bg-white p-4 border shadow rounded-md dark:bg-gray-800 dark:border-gray-700">
-        <embed
-          src={`data:${item.file?.type};base64,${item.file?.content.payload}`}
-          type={item.file?.type}
-          width="100%"
-          height="100%"
-        />
-      </div>
-    </div>
-  );
-});
-
-export default ProblemView;
diff --git a/client/src/pages/public/views/HomeView.tsx b/client/src/pages/public/views/HomeView.tsx
deleted file mode 100644
index c56fb78..0000000
--- a/client/src/pages/public/views/HomeView.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-import Scoreboard from '../../shared/Scoreboard';
-
-const HomeView: React.FC = () => {
-  return <Scoreboard />;
-};
-
-export default HomeView;
diff --git a/client/src/pages/shared/chat-box/ChatBox.tsx b/client/src/pages/shared/chat-box/ChatBox.tsx
deleted file mode 100644
index 02b58e4..0000000
--- a/client/src/pages/shared/chat-box/ChatBox.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { observer } from 'mobx-react';
-import React, { useEffect } from 'react';
-import { Clarification } from '../../../core/models';
-import { rootStore } from '../../../core/stores/RootStore';
-import { DataTableItemForm } from '../data-table/DataTable';
-import { SimpleDialog } from '../dialogs';
-import ChatBoxHeader from './ChatBoxHeader';
-import ChatBoxInput from './ChatBoxInput';
-import ChatBoxMessageList from './ChatBoxMessageList';
-
-const ChatBox: DataTableItemForm<Clarification> = observer(
-  ({ item: clarification, isOpen, onClose }) => {
-    const {
-      clarificationsStore: { item, setItem },
-    } = rootStore;
-
-    useEffect(() => {
-      setItem(clarification);
-    }, [setItem, clarification]);
-
-    return (
-      <SimpleDialog isOpen={isOpen} onClose={onClose} withoutFooter>
-        <div className="flex flex-col gap-y-4 dark:text-white">
-          <ChatBoxHeader clarification={item} />
-          <ChatBoxMessageList clarification={item} />
-          <ChatBoxInput clarification={item} />
-        </div>
-      </SimpleDialog>
-    );
-  },
-);
-
-export default ChatBox;
diff --git a/client/src/pages/shared/chat-box/ChatBoxMessageList.tsx b/client/src/pages/shared/chat-box/ChatBoxMessageList.tsx
deleted file mode 100644
index 370c51a..0000000
--- a/client/src/pages/shared/chat-box/ChatBoxMessageList.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import classNames from 'classnames';
-import { observer } from 'mobx-react';
-import React from 'react';
-import { Clarification } from '../../../core/models';
-import { rootStore } from '../../../core/stores/RootStore';
-
-type Props = { clarification: Clarification };
-
-const ChatBoxMessageList: React.FC<Props> = observer(({ clarification }) => {
-  const { profile } = rootStore;
-
-  return (
-    <div className="flex flex-col gap-2 p-2 h-96 overflow-y-auto border border-gray-200 rounded-lg dark:border-gray-700">
-      {clarification.messages.map((message, index) => (
-        <div key={index}>
-          <div
-            className={classNames('p-3 border border-gray-300 rounded-md w-min', {
-              'float-right bg-gray-100 dark:bg-gray-900 dark:border-gray-700':
-                message.sentBy?.role.name === profile?.role.name,
-              'float-left bg-gray-300 dark:bg-gray-700 dark:border-gray-800':
-                message.sentBy?.role.name !== profile?.role.name,
-            })}
-            ref={(el) => setTimeout(() => el?.scrollIntoView(), 10)}
-          >
-            {message.content}
-          </div>
-        </div>
-      ))}
-    </div>
-  );
-});
-
-export default ChatBoxMessageList;
diff --git a/client/src/pages/team/views/ClarificationsList.tsx b/client/src/pages/team/views/ClarificationsList.tsx
deleted file mode 100644
index 892fb16..0000000
--- a/client/src/pages/team/views/ClarificationsList.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { observable } from 'mobx';
-import { observer } from 'mobx-react';
-import React from 'react';
-import { Clarification } from '../../../core/models';
-import { rootStore } from '../../../core/stores/RootStore';
-import ChatBox from '../../shared/chat-box/ChatBox';
-import DataTable, { ListPageTableColumn } from '../../shared/data-table/DataTable';
-
-const ClarificationsList: React.FC = observer(() => {
-  const {
-    profile,
-    publicStore: { currentContest },
-    clarificationsStore: { fetchAllForTeam },
-  } = rootStore;
-
-  const columns: ListPageTableColumn<Clarification>[] = [
-    {
-      header: 'Subject',
-      field: 'problem',
-      render: (clarification) =>
-        clarification.general || !clarification.problem
-          ? 'General'
-          : `Problem ${
-              currentContest?.problems?.find(
-                (problem) => problem.problem.id === clarification.problem?.id,
-              )?.shortName ?? '-'
-            }`,
-    },
-  ];
-
-  const fetchAll = () =>
-    currentContest && profile?.team
-      ? fetchAllForTeam(currentContest.id, profile.team.id)
-      : Promise.resolve([]);
-
-  return (
-    <DataTable<Clarification>
-      header="Clarifications"
-      dataFetcher={fetchAll}
-      dataDependencies={[currentContest]}
-      fetchOnClose
-      columns={columns}
-      canDelete={() => false}
-      ItemForm={ChatBox}
-      formItemInitValue={observable({
-        general: true,
-        contest: currentContest,
-        team: profile?.team,
-        messages: [],
-      })}
-    />
-  );
-});
-
-export default ClarificationsList;
diff --git a/docker/judge/Dockerfile b/docker/judge/Dockerfile
index 7554ba6..2af12fe 100644
--- a/docker/judge/Dockerfile
+++ b/docker/judge/Dockerfile
@@ -3,7 +3,7 @@ FROM node:14.18.0-alpine as build-stage
 RUN apk add python3 gcc g++ make cmake
 
 WORKDIR /judge
-COPY judge .
+COPY projects/judge .
 RUN yarn
 RUN yarn build
 RUN yarn --prod
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index c5e4ec7..90ff05c 100644
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -1,12 +1,12 @@
 FROM node:14.18.0-alpine as build-stage
 
 WORKDIR /client
-COPY client .
+COPY projects/client .
 RUN yarn
 RUN yarn build
 
 WORKDIR /server
-COPY server .
+COPY projects/server .
 RUN yarn
 RUN yarn build
 RUN yarn --prod
diff --git a/judge/.prettierrc b/judge/.prettierrc
deleted file mode 100644
index 2fec1f2..0000000
--- a/judge/.prettierrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all",
-  "printWidth": 100
-}
diff --git a/package.json b/package.json
index 83a18be..0ea3975 100644
--- a/package.json
+++ b/package.json
@@ -4,13 +4,15 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "postinstall": "run-in-all -y install judge client server",
-    "prettier": "run-in-all -y prettier judge client server",
+    "postinstall": "run-in-all -y install projects/client projects/server projects/judge",
+    "lint": "run-in-all -y lint projects/client projects/server projects/judge",
+    "prettier": "prettier --check projects/{client,server,judge}/{src,test}/**/*.{ts,tsx}",
+    "prettier:fix": "prettier --write projects/{client,server,judge}/{src,test}/**/*.{ts,tsx}",
     "release": "standard-version -a ",
     "image:tag-and-push": "node scripts/tag-and-push-image",
     "version:current": "node scripts/current-version.js",
     "version:new": "yarn version --no-git-tag-version --new-version",
-    "version:update": "run-in-all --yarn version:new . judge client server --args"
+    "version:update": "run-in-all --yarn version:new . projects/client projects/server projects/judge --args"
   },
   "keywords": [],
   "author": "",
@@ -18,9 +20,15 @@
   "dependencies": {
     "@commitlint/cli": "^12.1.4",
     "@commitlint/config-conventional": "^12.1.4",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
+    "eslint": "^7.32.0",
     "husky": "^6.0.0",
+    "prettier": "^2.4.1",
+    "prettier-plugin-organize-imports": "^2.3.4",
     "run-in-all": "1.2.0",
-    "standard-version": "^9.3.1"
+    "standard-version": "^9.3.1",
+    "typescript": "^4.4.3"
   },
   "standard-version": {
     "skip": {
diff --git a/client/.eslintrc.js b/projects/client/.eslintrc.js
similarity index 100%
rename from client/.eslintrc.js
rename to projects/client/.eslintrc.js
diff --git a/client/.gitignore b/projects/client/.gitignore
similarity index 100%
rename from client/.gitignore
rename to projects/client/.gitignore
diff --git a/projects/client/.prettierrc b/projects/client/.prettierrc
new file mode 100644
index 0000000..ea9ebdb
--- /dev/null
+++ b/projects/client/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "printWidth": 100,
+  "singleQuote": true
+}
\ No newline at end of file
diff --git a/client/.snyk b/projects/client/.snyk
similarity index 100%
rename from client/.snyk
rename to projects/client/.snyk
diff --git a/client/README.md b/projects/client/README.md
similarity index 100%
rename from client/README.md
rename to projects/client/README.md
diff --git a/client/craco.config.js b/projects/client/craco.config.js
similarity index 100%
rename from client/craco.config.js
rename to projects/client/craco.config.js
diff --git a/client/package.json b/projects/client/package.json
similarity index 98%
rename from client/package.json
rename to projects/client/package.json
index 7e839e2..166bbb4 100644
--- a/client/package.json
+++ b/projects/client/package.json
@@ -7,7 +7,7 @@
     "start": "REACT_APP_VERSION=$npm_package_version PORT=3002 craco start",
     "build": "REACT_APP_VERSION=$npm_package_version craco build",
     "test": "REACT_APP_VERSION=$npm_package_version craco test",
-    "prettier": "prettier --check src",
+    "lint": "eslint \"{src,test}/**/*.ts\"",
     "version:new": "yarn version --no-git-tag-version --new-version"
   },
   "dependencies": {
diff --git a/client/public/favicon.ico b/projects/client/public/favicon.ico
similarity index 100%
rename from client/public/favicon.ico
rename to projects/client/public/favicon.ico
diff --git a/client/public/images/logo.png b/projects/client/public/images/logo.png
similarity index 100%
rename from client/public/images/logo.png
rename to projects/client/public/images/logo.png
diff --git a/client/public/index.html b/projects/client/public/index.html
similarity index 100%
rename from client/public/index.html
rename to projects/client/public/index.html
diff --git a/client/public/logo192.png b/projects/client/public/logo192.png
similarity index 100%
rename from client/public/logo192.png
rename to projects/client/public/logo192.png
diff --git a/client/public/logo512.png b/projects/client/public/logo512.png
similarity index 100%
rename from client/public/logo512.png
rename to projects/client/public/logo512.png
diff --git a/client/public/manifest.json b/projects/client/public/manifest.json
similarity index 100%
rename from client/public/manifest.json
rename to projects/client/public/manifest.json
diff --git a/client/public/robots.txt b/projects/client/public/robots.txt
similarity index 100%
rename from client/public/robots.txt
rename to projects/client/public/robots.txt
diff --git a/client/src/App.tsx b/projects/client/src/App.tsx
similarity index 100%
rename from client/src/App.tsx
rename to projects/client/src/App.tsx
diff --git a/client/src/core/helpers.ts b/projects/client/src/core/helpers.ts
similarity index 80%
rename from client/src/core/helpers.ts
rename to projects/client/src/core/helpers.ts
index 7868114..c30cd15 100644
--- a/client/src/core/helpers.ts
+++ b/projects/client/src/core/helpers.ts
@@ -1,6 +1,6 @@
 import moment from 'moment';
 import { useEffect, useState } from 'react';
-import { Contest, Judging, Testcase, User } from './models';
+import { Clarification, Contest, Judging, Testcase, User } from './models';
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export function isEmpty(s: any): boolean {
@@ -21,23 +21,25 @@ export function fileToBase64(file: File): Promise<string> {
 }
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export function generalComparator(a: any, b: any): number {
-  if (Array.isArray(a) && Array.isArray(b)) {
-    return a.length - b.length;
-  }
-  if (typeof a === 'number' && typeof b === 'number') {
-    return a - b;
-  }
-  if (typeof a === 'string' && typeof b === 'string') {
-    return a.localeCompare(b);
-  }
-  if (typeof a === 'object' && typeof b === 'object') {
-    if (a.name && b.name) {
-      return generalComparator(a.name, b.name);
+export function generalComparator(inverse = false): (a: any, b: any) => number {
+  return (a, b) => {
+    if (Array.isArray(a) && Array.isArray(b)) {
+      return inverse ? b.length - a.length : a.length - b.length;
     }
-    return generalComparator(a.id, b.id);
-  }
-  return 0;
+    if (typeof a === 'number' && typeof b === 'number') {
+      return inverse ? b - a : a - b;
+    }
+    if (typeof a === 'string' && typeof b === 'string') {
+      return inverse ? b.localeCompare(a) : a.localeCompare(b);
+    }
+    if (typeof a === 'object' && typeof b === 'object') {
+      if (a.name && b.name) {
+        return generalComparator(inverse)(a.name, b.name);
+      }
+      return generalComparator(inverse)(a.id, b.id);
+    }
+    return 0;
+  };
 }
 
 export function formatRestTime(time: number, withSeconds = true): string {
@@ -103,7 +105,7 @@ let interval: NodeJS.Timeout | undefined = undefined;
 
 export function updateLeftTimeToContest(
   contest?: Contest,
-  setLeftToContest?: (value: number) => void,
+  setLeftToContest?: (value: number) => void
 ): void {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
@@ -137,7 +139,7 @@ export function getRandomHexColor(): string {
 
 export function getJudgingRunColor(
   testcase: Testcase,
-  judging?: Judging,
+  judging?: Judging
 ): 'gray' | 'green' | 'red' {
   if (!judging) return 'gray';
   const judgeRun = judging.runs.find((r) => r.testcase.id === testcase.id);
@@ -146,7 +148,7 @@ export function getJudgingRunColor(
 
 export function useLongPress(
   callback: () => void,
-  ms = 100,
+  ms = 100
 ): {
   onMouseDown: () => void;
   onMouseUp: () => void;
@@ -191,3 +193,15 @@ export function getRGBColorContrast(rgb: string): number {
 
   return (0.299 * red + 0.587 * green + 0.114 * blue) / 255;
 }
+
+export function countUnseenMessages(clarification: Clarification, currentUser: User): number {
+  return clarification.messages.filter((m) => !m.seen && m.sentBy.id !== currentUser.id).length;
+}
+
+export function compareRoles(currentUser: User, sendingUser: User): boolean {
+  if (currentUser.role.name === 'team') {
+    return sendingUser.role.name === 'team';
+  }
+
+  return sendingUser.role.name !== 'team';
+}
diff --git a/client/src/core/models/clarification-message.model.ts b/projects/client/src/core/models/clarification-message.model.ts
similarity index 100%
rename from client/src/core/models/clarification-message.model.ts
rename to projects/client/src/core/models/clarification-message.model.ts
diff --git a/client/src/core/models/clarification.model.ts b/projects/client/src/core/models/clarification.model.ts
similarity index 100%
rename from client/src/core/models/clarification.model.ts
rename to projects/client/src/core/models/clarification.model.ts
diff --git a/client/src/core/models/contest-problem.model.ts b/projects/client/src/core/models/contest-problem.model.ts
similarity index 100%
rename from client/src/core/models/contest-problem.model.ts
rename to projects/client/src/core/models/contest-problem.model.ts
diff --git a/client/src/core/models/contest.model.ts b/projects/client/src/core/models/contest.model.ts
similarity index 100%
rename from client/src/core/models/contest.model.ts
rename to projects/client/src/core/models/contest.model.ts
diff --git a/client/src/core/models/executable.model.ts b/projects/client/src/core/models/executable.model.ts
similarity index 100%
rename from client/src/core/models/executable.model.ts
rename to projects/client/src/core/models/executable.model.ts
diff --git a/client/src/core/models/file-content.model.ts b/projects/client/src/core/models/file-content.model.ts
similarity index 100%
rename from client/src/core/models/file-content.model.ts
rename to projects/client/src/core/models/file-content.model.ts
diff --git a/client/src/core/models/file.model.ts b/projects/client/src/core/models/file.model.ts
similarity index 100%
rename from client/src/core/models/file.model.ts
rename to projects/client/src/core/models/file.model.ts
diff --git a/client/src/core/models/index.ts b/projects/client/src/core/models/index.ts
similarity index 100%
rename from client/src/core/models/index.ts
rename to projects/client/src/core/models/index.ts
diff --git a/client/src/core/models/judge-host.model.ts b/projects/client/src/core/models/judge-host.model.ts
similarity index 100%
rename from client/src/core/models/judge-host.model.ts
rename to projects/client/src/core/models/judge-host.model.ts
diff --git a/client/src/core/models/judging-run.model.ts b/projects/client/src/core/models/judging-run.model.ts
similarity index 100%
rename from client/src/core/models/judging-run.model.ts
rename to projects/client/src/core/models/judging-run.model.ts
diff --git a/client/src/core/models/judging.model.ts b/projects/client/src/core/models/judging.model.ts
similarity index 100%
rename from client/src/core/models/judging.model.ts
rename to projects/client/src/core/models/judging.model.ts
diff --git a/client/src/core/models/language.model.ts b/projects/client/src/core/models/language.model.ts
similarity index 100%
rename from client/src/core/models/language.model.ts
rename to projects/client/src/core/models/language.model.ts
diff --git a/client/src/core/models/problem.model.ts b/projects/client/src/core/models/problem.model.ts
similarity index 100%
rename from client/src/core/models/problem.model.ts
rename to projects/client/src/core/models/problem.model.ts
diff --git a/client/src/core/models/role.model.ts b/projects/client/src/core/models/role.model.ts
similarity index 100%
rename from client/src/core/models/role.model.ts
rename to projects/client/src/core/models/role.model.ts
diff --git a/client/src/core/models/score-cache.model.ts b/projects/client/src/core/models/score-cache.model.ts
similarity index 100%
rename from client/src/core/models/score-cache.model.ts
rename to projects/client/src/core/models/score-cache.model.ts
diff --git a/client/src/core/models/submission.model.ts b/projects/client/src/core/models/submission.model.ts
similarity index 100%
rename from client/src/core/models/submission.model.ts
rename to projects/client/src/core/models/submission.model.ts
diff --git a/client/src/core/models/team-category.model.ts b/projects/client/src/core/models/team-category.model.ts
similarity index 100%
rename from client/src/core/models/team-category.model.ts
rename to projects/client/src/core/models/team-category.model.ts
diff --git a/client/src/core/models/team.model.ts b/projects/client/src/core/models/team.model.ts
similarity index 100%
rename from client/src/core/models/team.model.ts
rename to projects/client/src/core/models/team.model.ts
diff --git a/client/src/core/models/testcase.model.ts b/projects/client/src/core/models/testcase.model.ts
similarity index 100%
rename from client/src/core/models/testcase.model.ts
rename to projects/client/src/core/models/testcase.model.ts
diff --git a/judge/src/models/user.model.ts b/projects/client/src/core/models/user.model.ts
similarity index 94%
rename from judge/src/models/user.model.ts
rename to projects/client/src/core/models/user.model.ts
index d063ef2..d3d4826 100644
--- a/judge/src/models/user.model.ts
+++ b/projects/client/src/core/models/user.model.ts
@@ -11,5 +11,5 @@ export interface User {
   lastIpAddress: string;
   enabled: boolean;
   role: Role;
-  team: Team;
+  team?: Team;
 }
diff --git a/client/src/core/stores/BaseEntityStore.ts b/projects/client/src/core/stores/BaseEntityStore.ts
similarity index 100%
rename from client/src/core/stores/BaseEntityStore.ts
rename to projects/client/src/core/stores/BaseEntityStore.ts
diff --git a/projects/client/src/core/stores/ClarificationsStore.ts b/projects/client/src/core/stores/ClarificationsStore.ts
new file mode 100644
index 0000000..f5d2ace
--- /dev/null
+++ b/projects/client/src/core/stores/ClarificationsStore.ts
@@ -0,0 +1,57 @@
+import { action, observable } from 'mobx';
+import { Clarification } from '../models';
+import http from '../utils/http-client';
+import { RootStore } from './RootStore';
+
+export class ClarificationsStore {
+  @observable data: Clarification[] = [];
+  @observable item: Clarification = { general: true, messages: [] } as any;
+
+  constructor(private readonly rootStore: RootStore) {}
+
+  @action
+  setItem = (item: Clarification): void => {
+    this.item = item;
+  };
+
+  @action
+  refreshItem = (): void => {
+    this.item = this.data.find((item) => item.id === this.item.id) ?? this.item;
+  };
+
+  @action
+  fetchAllForContest = async (contestId: number): Promise<Clarification[]> => {
+    this.data = await http.get(`api/contests/${contestId}/clarifications`);
+    this.refreshItem();
+    return this.data;
+  };
+
+  @action
+  fetchAllForTeam = async (contestId: number, teamId: number): Promise<Clarification[]> => {
+    this.data = await http.get(`api/contests/${contestId}/team/${teamId}/clarifications`);
+    this.refreshItem();
+    return this.data;
+  };
+
+  @action
+  sendClarification = async (
+    contestId: number,
+    clarification: Clarification
+  ): Promise<Clarification> => {
+    return (this.item = await http.post<Clarification>(
+      `api/contests/${contestId}/clarifications`,
+      clarification
+    ));
+  };
+
+  @action
+  setClarificationMessageAsSeen = async (
+    contestId: number,
+    clarificationId: number,
+    messageId: number
+  ): Promise<void> => {
+    await http.patch<Clarification>(
+      `api/contests/${contestId}/clarifications/${clarificationId}/message/${messageId}/set-as-seen`
+    );
+  };
+}
diff --git a/client/src/core/stores/ContestsStore.ts b/projects/client/src/core/stores/ContestsStore.ts
similarity index 100%
rename from client/src/core/stores/ContestsStore.ts
rename to projects/client/src/core/stores/ContestsStore.ts
diff --git a/client/src/core/stores/ExecutablesStore.ts b/projects/client/src/core/stores/ExecutablesStore.ts
similarity index 100%
rename from client/src/core/stores/ExecutablesStore.ts
rename to projects/client/src/core/stores/ExecutablesStore.ts
diff --git a/client/src/core/stores/JudgeHostsStore.ts b/projects/client/src/core/stores/JudgeHostsStore.ts
similarity index 100%
rename from client/src/core/stores/JudgeHostsStore.ts
rename to projects/client/src/core/stores/JudgeHostsStore.ts
diff --git a/client/src/core/stores/LanguagesStore.ts b/projects/client/src/core/stores/LanguagesStore.ts
similarity index 100%
rename from client/src/core/stores/LanguagesStore.ts
rename to projects/client/src/core/stores/LanguagesStore.ts
diff --git a/client/src/core/stores/ProblemsStore.ts b/projects/client/src/core/stores/ProblemsStore.ts
similarity index 100%
rename from client/src/core/stores/ProblemsStore.ts
rename to projects/client/src/core/stores/ProblemsStore.ts
diff --git a/client/src/core/stores/PublicStore.ts b/projects/client/src/core/stores/PublicStore.ts
similarity index 96%
rename from client/src/core/stores/PublicStore.ts
rename to projects/client/src/core/stores/PublicStore.ts
index 75f7c51..eb80f6e 100644
--- a/client/src/core/stores/PublicStore.ts
+++ b/projects/client/src/core/stores/PublicStore.ts
@@ -16,7 +16,7 @@ export class PublicStore {
           await this.fetchScoreCaches(this.currentContest.id);
         }
       },
-      { delay: 10 },
+      { delay: 10 }
     );
     autorun(
       async () => {
@@ -24,7 +24,7 @@ export class PublicStore {
           await this.fetchContests();
         }
       },
-      { delay: 10 },
+      { delay: 10 }
     );
     autorun(
       async () => {
@@ -32,7 +32,7 @@ export class PublicStore {
           await this.fetchProblems(this.currentContest.id);
         }
       },
-      { delay: 10 },
+      { delay: 10 }
     );
   }
 
@@ -51,7 +51,7 @@ export class PublicStore {
   @action
   fetchProblems = async (contestId: number): Promise<ContestProblem[]> => {
     return (this.problems = await http.get<ContestProblem[]>(
-      `api/public/contest/${contestId}/problems`,
+      `api/public/contest/${contestId}/problems`
     ));
   };
 
@@ -72,7 +72,7 @@ export class PublicStore {
   get totalSubmissions(): number {
     return this.scoreCaches.reduce<number>(
       (acc, scoreCache) => acc + scoreCache.restrictedSubmissions + scoreCache.restrictedPending,
-      0,
+      0
     );
   }
 
diff --git a/client/src/core/stores/RootStore.ts b/projects/client/src/core/stores/RootStore.ts
similarity index 95%
rename from client/src/core/stores/RootStore.ts
rename to projects/client/src/core/stores/RootStore.ts
index 21d592a..9efee46 100644
--- a/client/src/core/stores/RootStore.ts
+++ b/projects/client/src/core/stores/RootStore.ts
@@ -20,7 +20,14 @@ import { UsersStore } from './UsersStore';
 
 const SESSION_LENGTH = 24 * 60 * 60 * 1000;
 
-const updateEvents = ['contests', 'scoreboard', 'submissions', 'judgings', 'judgeRuns'] as const;
+const updateEvents = [
+  'contests',
+  'scoreboard',
+  'submissions',
+  'judgings',
+  'judgeRuns',
+  'clarifications',
+] as const;
 type UpdateEvents = typeof updateEvents[number];
 
 type AppLocalCache = {
@@ -44,6 +51,7 @@ export class RootStore {
     judgeRuns: 1,
     scoreboard: 1,
     submissions: 1,
+    clarifications: 1,
   };
   @observable updatesCount: Record<UpdateEvents, number> = {
     contests: 1,
@@ -51,6 +59,7 @@ export class RootStore {
     judgeRuns: 1,
     scoreboard: 1,
     submissions: 1,
+    clarifications: 1,
   };
 
   socket: Socket = io(`/ws`, { transports: ['websocket'] });
@@ -99,7 +108,7 @@ export class RootStore {
     autorun(
       () =>
         this.connected && http.get<User>(`api/current`).then(this.setProfile).catch(this.logout),
-      { delay: 10 },
+      { delay: 10 }
     );
 
     autorun(() => localStorage.setItem('settings', JSON.stringify(this.appLocalCache)));
diff --git a/client/src/core/stores/SubmissionsStore.ts b/projects/client/src/core/stores/SubmissionsStore.ts
similarity index 98%
rename from client/src/core/stores/SubmissionsStore.ts
rename to projects/client/src/core/stores/SubmissionsStore.ts
index d2a6eaf..dbc11ea 100644
--- a/client/src/core/stores/SubmissionsStore.ts
+++ b/projects/client/src/core/stores/SubmissionsStore.ts
@@ -40,7 +40,7 @@ export class SubmissionsStore {
   fetchAll = async (): Promise<Submission[]> => {
     this.filters.contest = this.rootStore.publicStore.currentContest?.id ?? -1;
     [this.data, this.totalItems] = await http.get<[Submission[], number]>(
-      `api/submissions?page=${this.currentPage}&${buildSearchQuery(this.filters)}`,
+      `api/submissions?page=${this.currentPage}&${buildSearchQuery(this.filters)}`
     );
     return this.data;
   };
@@ -79,7 +79,7 @@ export class SubmissionsStore {
 }
 
 function buildSearchQuery(
-  filters: Record<string, string | boolean | number | string[] | boolean[] | number[]>,
+  filters: Record<string, string | boolean | number | string[] | boolean[] | number[]>
 ): string {
   return Object.entries(filters)
     .filter(([, value]) => !isEmpty(value))
diff --git a/client/src/core/stores/TeamCategoriesStore.ts b/projects/client/src/core/stores/TeamCategoriesStore.ts
similarity index 100%
rename from client/src/core/stores/TeamCategoriesStore.ts
rename to projects/client/src/core/stores/TeamCategoriesStore.ts
diff --git a/client/src/core/stores/TeamStore.ts b/projects/client/src/core/stores/TeamStore.ts
similarity index 95%
rename from client/src/core/stores/TeamStore.ts
rename to projects/client/src/core/stores/TeamStore.ts
index 63a5e25..f12d49a 100644
--- a/client/src/core/stores/TeamStore.ts
+++ b/projects/client/src/core/stores/TeamStore.ts
@@ -14,7 +14,7 @@ export class TeamStore {
   sendSubmission = async (
     contestId: number,
     teamId: number,
-    submission: Submission,
+    submission: Submission
   ): Promise<void> => {
     await http.post(`api/contests/${contestId}/team/${teamId}/submit`, submission);
   };
diff --git a/client/src/core/stores/TeamsStore.ts b/projects/client/src/core/stores/TeamsStore.ts
similarity index 100%
rename from client/src/core/stores/TeamsStore.ts
rename to projects/client/src/core/stores/TeamsStore.ts
diff --git a/client/src/core/stores/TestcasesStore.ts b/projects/client/src/core/stores/TestcasesStore.ts
similarity index 98%
rename from client/src/core/stores/TestcasesStore.ts
rename to projects/client/src/core/stores/TestcasesStore.ts
index 97a1732..ea4dfe7 100644
--- a/client/src/core/stores/TestcasesStore.ts
+++ b/projects/client/src/core/stores/TestcasesStore.ts
@@ -14,7 +14,7 @@ export class TestcasesStore {
         this.problemId && this.fetchAll();
         !this.problemId && (this.data = []);
       },
-      { delay: 10 },
+      { delay: 10 }
     );
   }
 
diff --git a/client/src/core/stores/ToastsStore.ts b/projects/client/src/core/stores/ToastsStore.ts
similarity index 100%
rename from client/src/core/stores/ToastsStore.ts
rename to projects/client/src/core/stores/ToastsStore.ts
diff --git a/client/src/core/stores/TooltipStore.ts b/projects/client/src/core/stores/TooltipStore.ts
similarity index 100%
rename from client/src/core/stores/TooltipStore.ts
rename to projects/client/src/core/stores/TooltipStore.ts
diff --git a/client/src/core/stores/UsersStore.ts b/projects/client/src/core/stores/UsersStore.ts
similarity index 100%
rename from client/src/core/stores/UsersStore.ts
rename to projects/client/src/core/stores/UsersStore.ts
diff --git a/client/src/core/types.ts b/projects/client/src/core/types.ts
similarity index 100%
rename from client/src/core/types.ts
rename to projects/client/src/core/types.ts
diff --git a/client/src/core/utils/http-client.ts b/projects/client/src/core/utils/http-client.ts
similarity index 97%
rename from client/src/core/utils/http-client.ts
rename to projects/client/src/core/utils/http-client.ts
index 1e1b279..3189085 100644
--- a/client/src/core/utils/http-client.ts
+++ b/projects/client/src/core/utils/http-client.ts
@@ -26,7 +26,7 @@ export class HttpClient {
 export async function request<T>(
   path: string,
   method: Method = 'GET',
-  options?: AxiosRequestConfig,
+  options?: AxiosRequestConfig
 ): Promise<T> {
   try {
     return (
diff --git a/client/src/index.scss b/projects/client/src/index.scss
similarity index 100%
rename from client/src/index.scss
rename to projects/client/src/index.scss
diff --git a/client/src/index.tsx b/projects/client/src/index.tsx
similarity index 92%
rename from client/src/index.tsx
rename to projects/client/src/index.tsx
index a68889c..7e8a818 100644
--- a/client/src/index.tsx
+++ b/projects/client/src/index.tsx
@@ -12,5 +12,5 @@ ReactDOM.render(
       <App />
     </Provider>
   </Suspense>,
-  document.getElementById('root'),
+  document.getElementById('root')
 );
diff --git a/client/src/pages/admin/AdminLayout.tsx b/projects/client/src/pages/admin/AdminLayout.tsx
similarity index 84%
rename from client/src/pages/admin/AdminLayout.tsx
rename to projects/client/src/pages/admin/AdminLayout.tsx
index 6dd0693..13703dc 100644
--- a/client/src/pages/admin/AdminLayout.tsx
+++ b/projects/client/src/pages/admin/AdminLayout.tsx
@@ -2,6 +2,7 @@ import { observer } from 'mobx-react';
 import React from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
 import { rootStore } from '../../core/stores/RootStore';
+import { NoActiveContest } from '../shared/NoActiveContest';
 import Scoreboard from '../shared/Scoreboard';
 import AdminNavbar from './AdminNavbar';
 import AdminSideBar from './AdminSidebar';
@@ -20,10 +21,14 @@ import TeamsList from './views/teams/TeamsList';
 import UsersList from './views/users/UsersList';
 
 const AdminLayout: React.FC = observer(() => {
+  const {
+    publicStore: { currentContest },
+  } = rootStore;
+
   return (
-    <div className="flex h-screen p-4 gap-4 bg-gray-100 dark:bg-gray-900">
+    <div className="flex h-screen bg-gray-100 dark:bg-gray-900">
       <AdminSideBar visible={!rootStore.appLocalCache.menuCollapsed} />
-      <div className="flex flex-col gap-4 w-full overflow-hidden">
+      <div className="flex flex-col w-full overflow-hidden">
         <AdminNavbar
           toggleSidebar={() =>
             (rootStore.appLocalCache.menuCollapsed = !rootStore.appLocalCache.menuCollapsed)
@@ -43,7 +48,13 @@ const AdminLayout: React.FC = observer(() => {
           <Route exact path="/submissions" component={SubmissionsList} />
           <Route path="/submissions/:id" component={SubmissionsView} />
           <Route exact path="/clarifications" component={ClarificationsList} />
-          <Route exact path="/scoreboard" component={Scoreboard} />
+          <Route
+            exact
+            path="/scoreboard"
+            render={() =>
+              currentContest ? <Scoreboard contest={currentContest} /> : <NoActiveContest />
+            }
+          />
           <Route render={() => <Redirect to="/" />} />
         </Switch>
       </div>
diff --git a/projects/client/src/pages/admin/AdminNavbar.tsx b/projects/client/src/pages/admin/AdminNavbar.tsx
new file mode 100644
index 0000000..8397ab3
--- /dev/null
+++ b/projects/client/src/pages/admin/AdminNavbar.tsx
@@ -0,0 +1,46 @@
+import { Menu } from '@headlessui/react';
+import { LogoutIcon, UserIcon, ViewListIcon } from '@heroicons/react/outline';
+import { observer } from 'mobx-react';
+import React from 'react';
+import { useHistory } from 'react-router-dom';
+import { rootStore } from '../../core/stores/RootStore';
+import ActiveContestSelector from '../shared/ActiveContestSelector';
+import { DarkModeSwitcher } from '../shared/DarkModeSwitcher';
+
+type AdminNavbarProps = { toggleSidebar: () => void };
+
+const AdminNavbar: React.FC<AdminNavbarProps> = observer(({ toggleSidebar }) => {
+  const history = useHistory();
+  const { profile } = rootStore;
+
+  return (
+    <div className="p-4 pb-0">
+      <div className="select-none p-1 px-3 text-black bg-white shadow-md rounded-md flex items-center w-full justify-between dark:text-white dark:bg-gray-800">
+        <ViewListIcon className="h-6 w-6 cursor-pointer" onClick={toggleSidebar} />
+        <div className="flex items-center gap-2">
+          <ActiveContestSelector className="p-2 rounded-md hover:bg-gray-200 dark:hover:bg-gray-700" />
+          <Menu as="div" className="relative">
+            <Menu.Button
+              as="div"
+              className="flex items-center justify-center gap-1 p-2 rounded-md cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-700"
+            >
+              <UserIcon className="h-4 w-4" />
+              {profile?.name ?? '-'}
+            </Menu.Button>
+            <Menu.Items className="absolute z-50 transform left-1/2 -translate-x-1/2 w-36 mt-4 p-2 gap-2 bg-white rounded-md shadow-md outline-none dark:bg-gray-800">
+              <Menu.Item onClick={() => history.push('/logout')}>
+                <div className="flex items-center gap-1 px-3 py-2 cursor-pointer rounded-md hover:bg-gray-200 dark:hover:bg-gray-700">
+                  <LogoutIcon className="h-4 w-4" />
+                  Logout
+                </div>
+              </Menu.Item>
+            </Menu.Items>
+          </Menu>
+          <DarkModeSwitcher />
+        </div>
+      </div>
+    </div>
+  );
+});
+
+export default AdminNavbar;
diff --git a/client/src/pages/admin/AdminSidebar.tsx b/projects/client/src/pages/admin/AdminSidebar.tsx
similarity index 94%
rename from client/src/pages/admin/AdminSidebar.tsx
rename to projects/client/src/pages/admin/AdminSidebar.tsx
index 7bf2d71..424aeeb 100644
--- a/client/src/pages/admin/AdminSidebar.tsx
+++ b/projects/client/src/pages/admin/AdminSidebar.tsx
@@ -27,6 +27,8 @@ const AdminSidebar: React.FC<{ visible: boolean }> = observer(({ visible }) => {
     publicStore: { totalPendingSubmissions },
   } = rootStore;
 
+  history.listen(() => setCurrentTab(location.pathname.replace(/\/?/g, '')));
+
   const onLinkClick = (tab: string) => {
     setCurrentTab(tab);
     history.push(`/${tab}`);
@@ -102,14 +104,14 @@ const AdminSidebar: React.FC<{ visible: boolean }> = observer(({ visible }) => {
   ];
 
   return (
-    <nav className="text-black dark:text-white">
+    <nav className="p-4 pr-0 text-black dark:text-white">
       <div
         className={classNames('flex-col h-full transition-all duration-200 ease-in-out', {
           'w-72': visible,
           'w-16': !visible,
         })}
       >
-        <div className="bg-white h-full rounded-lg p-2 shadow border border-gray-200 dark:bg-gray-800 dark:border-gray-700">
+        <div className="bg-white h-full rounded-lg p-2 shadow-md dark:bg-gray-800">
           <div
             className="text-2xl text-center p-2 py-4 mb-2 cursor-pointer"
             onClick={() => onLinkClick('')}
@@ -133,7 +135,7 @@ const AdminSidebar: React.FC<{ visible: boolean }> = observer(({ visible }) => {
                       'text-gray-500 hover:bg-gray-500 hover:text-white dark:text-gray-400 dark:hover:bg-gray-700':
                         currentTab !== key,
                       'justify-center': !visible,
-                    },
+                    }
                   )}
                   onClick={() => onLinkClick(key)}
                 >
diff --git a/client/src/pages/admin/views/Dashboard.tsx b/projects/client/src/pages/admin/views/Dashboard.tsx
similarity index 50%
rename from client/src/pages/admin/views/Dashboard.tsx
rename to projects/client/src/pages/admin/views/Dashboard.tsx
index f7e2df6..3cc477d 100644
--- a/client/src/pages/admin/views/Dashboard.tsx
+++ b/projects/client/src/pages/admin/views/Dashboard.tsx
@@ -12,6 +12,7 @@ import React from 'react';
 import { getDisplayDate } from '../../../core/helpers';
 import { Contest } from '../../../core/models';
 import { rootStore } from '../../../core/stores/RootStore';
+import { NoActiveContest } from '../../shared/NoActiveContest';
 
 const Dashboard: React.FC = observer(() => {
   const {
@@ -85,70 +86,66 @@ const Dashboard: React.FC = observer(() => {
     },
   ];
 
-  return (
-    <div className="xl:container mx-auto space-y-4 dark:text-white overflow-auto">
+  return !currentContest ? (
+    <NoActiveContest />
+  ) : (
+    <div className="p-4 xl:container mx-auto space-y-4 dark:text-white overflow-auto">
       <div className="flex items-center justify-center p-2 bg-white border rounded-md shadow dark:bg-gray-800 dark:border-gray-700">
         <div className="text-4xl font-medium">
           {currentContest ? currentContest.name : 'No Active Contest'}
         </div>
       </div>
-      {currentContest && (
-        <>
-          <div className="divide-y border rounded bg-white shadow dark:bg-gray-800 dark:border-gray-700 dark:divide-gray-700">
-            <div className="flex items-center justify-center p-2">
-              <div className="text-2xl">Submissions Statistics</div>
-            </div>
-            <div className="grid grid-cols-2 sm:grid-cols-4 text-center">
-              <div className="flex flex-col space-y-1 py-4">
-                <div className="text-6xl font-medium">{totalSubmissions}</div>
-                <div className="text-md uppercase font-medium">Total</div>
-              </div>
-              <div className="flex flex-col space-y-1 py-4">
-                <div className="text-6xl font-medium text-yellow-600">
-                  {totalPendingSubmissions}
-                </div>
-                <div className="text-md uppercase font-medium">Pending</div>
-              </div>
-              <div className="flex flex-col space-y-1 py-4">
-                <div className="text-6xl font-medium text-red-600">{totalWrongSubmissions}</div>
-                <div className="text-md uppercase font-medium">Wrong</div>
-              </div>
-              <div className="flex flex-col space-y-1 py-4">
-                <div className="text-6xl font-medium text-green-600">{totalCorrectSubmissions}</div>
-                <div className="text-md uppercase font-medium">Correct</div>
-              </div>
-            </div>
+      <div className="divide-y border rounded-md bg-white shadow dark:bg-gray-800 dark:border-gray-700 dark:divide-gray-700">
+        <div className="flex items-center justify-center p-2">
+          <div className="text-2xl">Submissions Statistics</div>
+        </div>
+        <div className="grid grid-cols-2 sm:grid-cols-4 text-center">
+          <div className="flex flex-col space-y-1 py-4">
+            <div className="text-6xl font-medium">{totalSubmissions}</div>
+            <div className="text-md uppercase font-medium">Total</div>
           </div>
-          <div className="divide-y border rounded bg-white shadow dark:bg-gray-800 dark:border-gray-700 dark:divide-gray-700">
-            <div className="flex items-center justify-center p-2">
-              <div className="text-2xl">Control Contest</div>
-            </div>
-            <div className="grid grid-cols-2 sm:grid-cols-5 text-center divide-x dark:divide-gray-700">
-              {controlActions.map(({ Icon, action, time, onClick, disabled, completed }, index) => (
-                <div
-                  key={index}
-                  className={classNames('flex items-center sm:col-auto select-none p-4', {
-                    'cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-700': !disabled,
-                    'text-gray-400 bg-gray-50 dark:bg-gray-600': disabled,
-                    'col-span-2': index === controlActions.length - 1,
-                  })}
-                  onClick={disabled || completed ? undefined : onClick(currentContest)}
-                >
-                  {completed ? (
-                    <CheckCircleIcon className="h-16 w-16 ml-4 mr-2 text-green-600" />
-                  ) : (
-                    <Icon className="h-16 w-16 ml-4 mr-2" />
-                  )}
-                  <div className="flex flex-col space-y-1 w-full">
-                    <div className="text-lg font-medium">{action}</div>
-                    <div>{getDisplayDate(time(currentContest))}</div>
-                  </div>
-                </div>
-              ))}
-            </div>
+          <div className="flex flex-col space-y-1 py-4">
+            <div className="text-6xl font-medium text-yellow-600">{totalPendingSubmissions}</div>
+            <div className="text-md uppercase font-medium">Pending</div>
           </div>
-        </>
-      )}
+          <div className="flex flex-col space-y-1 py-4">
+            <div className="text-6xl font-medium text-red-600">{totalWrongSubmissions}</div>
+            <div className="text-md uppercase font-medium">Wrong</div>
+          </div>
+          <div className="flex flex-col space-y-1 py-4">
+            <div className="text-6xl font-medium text-green-600">{totalCorrectSubmissions}</div>
+            <div className="text-md uppercase font-medium">Correct</div>
+          </div>
+        </div>
+      </div>
+      <div className="divide-y border rounded-md bg-white shadow dark:bg-gray-800 dark:border-gray-700 dark:divide-gray-700 overflow-hidden">
+        <div className="flex items-center justify-center p-2">
+          <div className="text-2xl">Control Contest</div>
+        </div>
+        <div className="grid grid-cols-2 sm:grid-cols-5 text-center divide-x dark:divide-gray-700">
+          {controlActions.map(({ Icon, action, time, onClick, disabled, completed }, index) => (
+            <div
+              key={index}
+              className={classNames('flex items-center sm:col-auto select-none p-4', {
+                'cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-700': !disabled,
+                'text-gray-400 bg-gray-50 dark:bg-gray-600': disabled,
+                'col-span-2': index === controlActions.length - 1,
+              })}
+              onClick={disabled || completed ? undefined : onClick(currentContest)}
+            >
+              {completed ? (
+                <CheckCircleIcon className="h-16 w-16 ml-4 mr-2 text-green-600" />
+              ) : (
+                <Icon className="h-16 w-16 ml-4 mr-2" />
+              )}
+              <div className="flex flex-col space-y-1 w-full">
+                <div className="text-lg font-medium">{action}</div>
+                <div>{getDisplayDate(time(currentContest))}</div>
+              </div>
+            </div>
+          ))}
+        </div>
+      </div>
     </div>
   );
 });
diff --git a/projects/client/src/pages/admin/views/clarifications/ClarificationsList.tsx b/projects/client/src/pages/admin/views/clarifications/ClarificationsList.tsx
new file mode 100644
index 0000000..f9f4f5c
--- /dev/null
+++ b/projects/client/src/pages/admin/views/clarifications/ClarificationsList.tsx
@@ -0,0 +1,194 @@
+import { ChevronDownIcon, ChevronRightIcon } from '@heroicons/react/outline';
+import { RefreshIcon } from '@heroicons/react/solid';
+import classNames from 'classnames';
+import { observer } from 'mobx-react';
+import React, { useEffect, useState } from 'react';
+import { countUnseenMessages } from '../../../../core/helpers';
+import { Clarification, ContestProblem } from '../../../../core/models';
+import { rootStore } from '../../../../core/stores/RootStore';
+import ChatBox from '../../../shared/chat-box/ChatBox';
+import { NoActiveContest } from '../../../shared/NoActiveContest';
+
+const ClarificationsList: React.FC = observer(() => {
+  const {
+    updatesCount: { clarifications },
+    publicStore: { currentContest },
+    clarificationsStore: { item, data, setItem, fetchAllForContest },
+  } = rootStore;
+  const [tabStatus, setTabStatus] = useState<Record<number | 'general', boolean>>({
+    general: false,
+  });
+
+  useEffect(() => {
+    if (currentContest) {
+      fetchAllForContest(currentContest.id);
+    }
+  }, [currentContest, clarifications, fetchAllForContest]);
+
+  useEffect(() => {
+    if (currentContest) {
+      currentContest.problems.forEach((cp) =>
+        setTabStatus((tabStatus) => ({ ...tabStatus, [cp.problem.id]: false }))
+      );
+    }
+  }, [currentContest]);
+
+  const flipTabStatus = (tab: number | 'general') => () =>
+    setTabStatus((tabStatus) => ({ ...tabStatus, [tab]: !tabStatus[tab] }));
+
+  return !currentContest ? (
+    <NoActiveContest />
+  ) : (
+    <div className="flex flex-col dark:text-white h-full overflow-hidden">
+      <div className="p-4 pb-0">
+        <div className="flex items-center shadow-md rounded-md w-full justify-between px-4 py-2 bg-white dark:bg-gray-800">
+          <div className="text-xl font-medium">Clarifications</div>
+          <div className="flex items-center space-x-2">
+            <div className="hover:bg-gray-200 rounded-md p-2 cursor-pointer">
+              <RefreshIcon
+                className="w-6 h-6"
+                onClick={() => fetchAllForContest(currentContest.id)}
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="flex h-full p-4 gap-4 overflow-hidden">
+        <div className="w-72 p-4 bg-white shadow-md rounded-md overflow-auto dark:bg-gray-800 dark:border-gray-700">
+          <div className="flex flex-col gap-4 select-none">
+            <div
+              className="p-2 rounded-lg text-white bg-blue-600 text-center cursor-pointer"
+              onClick={() =>
+                setItem({
+                  general: true,
+                  contest: currentContest,
+                  messages: [],
+                } as any)
+              }
+            >
+              New Clarification
+            </div>
+            <ClarificationGroupTab
+              clarifications={data.filter((clarification) => clarification.general)}
+              selectedClarifications={item}
+              open={tabStatus.general}
+              onTabClick={flipTabStatus('general')}
+              onClarificationClick={setItem}
+            />
+            {currentContest.problems.map((contestProblem) => {
+              const filteredClarifications = data.filter(
+                (clarification) => clarification.problem?.id === contestProblem.problem.id
+              );
+
+              if (!filteredClarifications.length) return undefined;
+
+              return (
+                <ClarificationGroupTab
+                  key={contestProblem.problem.id}
+                  clarifications={filteredClarifications}
+                  selectedClarifications={item}
+                  problem={contestProblem}
+                  open={tabStatus[contestProblem.problem.id]}
+                  onTabClick={flipTabStatus(contestProblem.problem.id)}
+                  onClarificationClick={setItem}
+                />
+              );
+            })}
+          </div>
+        </div>
+        <div className="w-full p-4 bg-white shadow-md rounded-md dark:bg-gray-800 dark:border-gray-700">
+          <ChatBox item={item} isOpen onClose={() => false} onSubmit={() => false} />
+        </div>
+      </div>
+    </div>
+  );
+});
+
+export default ClarificationsList;
+
+const ClarificationGroupTab: React.FC<{
+  clarifications: Clarification[];
+  selectedClarifications: Clarification;
+  problem?: ContestProblem;
+  open: boolean;
+  onTabClick: (tab: number | 'general') => void;
+  onClarificationClick: (item: Clarification) => void;
+}> = ({
+  clarifications,
+  selectedClarifications,
+  problem,
+  open,
+  onTabClick,
+  onClarificationClick,
+}) => {
+  const { profile } = rootStore;
+  const unseenMessagesCount = clarifications.reduce(
+    (prev, curr) => prev + countUnseenMessages(curr, profile!),
+    0
+  );
+
+  return (
+    <div className="flex flex-col gap-3">
+      <div
+        className="flex justify-between cursor-pointer"
+        onClick={() => onTabClick(problem?.problem.id ?? 'general')}
+      >
+        <div className="flex items-center gap-2">
+          {open ? (
+            <ChevronDownIcon className="w-4 h-4" />
+          ) : (
+            <ChevronRightIcon className="w-4 h-4" />
+          )}
+          {problem ? `${problem.shortName} - ${problem.problem.name}` : 'General'}
+        </div>
+        {unseenMessagesCount > 0 && (
+          <div className="text-sm text-white px-2 py-0.5 rounded-md bg-purple-500 float-right">
+            {unseenMessagesCount}
+          </div>
+        )}
+      </div>
+      {!clarifications.length ? (
+        <div className="ml-5 text-sm text-gray-500">No Discussions</div>
+      ) : (
+        open &&
+        clarifications.map((clarification) => (
+          <ClarificationTab
+            key={clarification.id}
+            clarification={clarification}
+            active={clarification.id === selectedClarifications?.id}
+            onClick={onClarificationClick}
+          />
+        ))
+      )}
+    </div>
+  );
+};
+
+const ClarificationTab: React.FC<{
+  clarification: Clarification;
+  active: boolean;
+  onClick: (item: Clarification) => void;
+}> = ({ clarification, active, onClick }) => {
+  const { profile } = rootStore;
+  const unseenMessagesCount = countUnseenMessages(clarification, profile!);
+
+  return (
+    <div
+      className={classNames(
+        'ml-5 p-2 shadow rounded-lg cursor-pointer border dark:border-gray-600 dark:hover:bg-gray-700 truncate',
+        {
+          'bg-gray-200 dark:bg-gray-700': active,
+        }
+      )}
+      title={clarification.team?.name ?? 'Broadcast'}
+      onClick={() => onClick(clarification)}
+    >
+      {clarification.team?.name ?? 'Broadcast'}
+      {unseenMessagesCount > 0 && (
+        <div className="text-sm text-white px-2 py-0.5 rounded-md bg-green-500 float-right">
+          {unseenMessagesCount}
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/client/src/pages/admin/views/contests/ContestForm.tsx b/projects/client/src/pages/admin/views/contests/ContestForm.tsx
similarity index 98%
rename from client/src/pages/admin/views/contests/ContestForm.tsx
rename to projects/client/src/pages/admin/views/contests/ContestForm.tsx
index b4ccdfc..ef360c3 100644
--- a/client/src/pages/admin/views/contests/ContestForm.tsx
+++ b/projects/client/src/pages/admin/views/contests/ContestForm.tsx
@@ -22,7 +22,7 @@ const ContestForm: DataTableItemForm<Contest> = observer(
       contest.problems.map((p) => ({
         problem: isEmpty(p.problem),
         shortName: isEmpty(p.shortName),
-      })),
+      }))
     );
     const { data: problems, fetchAll } = rootStore.problemsStore;
 
@@ -46,14 +46,14 @@ const ContestForm: DataTableItemForm<Contest> = observer(
           problem:
             isEmpty(cp.problem) ||
             contest.problems.filter(
-              (p) => p.problem && cp.problem && p.problem.id === cp.problem.id,
+              (p) => p.problem && cp.problem && p.problem.id === cp.problem.id
             ).length > 1,
           shortName:
             isEmpty(cp.shortName) ||
             contest.problems.filter(
-              (p) => p.shortName && cp.shortName && p.shortName.trim() === cp.shortName.trim(),
+              (p) => p.shortName && cp.shortName && p.shortName.trim() === cp.shortName.trim()
             ).length > 1,
-        })),
+        }))
       );
     }, [contest.problems]);
 
@@ -248,8 +248,8 @@ const ContestForm: DataTableItemForm<Contest> = observer(
                             (problemsErrors[index].problem =
                               isEmpty(problemsErrors[index].problem) ||
                               contest.problems.filter(
-                                (p) => p.problem && cp.problem && p.problem.id === cp.problem.id,
-                              ).length > 1),
+                                (p) => p.problem && cp.problem && p.problem.id === cp.problem.id
+                              ).length > 1)
                         );
                         setProblemsErrors(problemsErrors);
                       }}
@@ -270,7 +270,7 @@ const ContestForm: DataTableItemForm<Contest> = observer(
                               (p) =>
                                 p.shortName &&
                                 cp.shortName &&
-                                p.shortName.trim() === cp.shortName.trim(),
+                                p.shortName.trim() === cp.shortName.trim()
                             ).length > 1;
                         });
                         setProblemsErrors(problemsErrors);
@@ -349,7 +349,7 @@ const ContestForm: DataTableItemForm<Contest> = observer(
         </div>
       </FormModal>
     );
-  },
+  }
 );
 
 export default ContestForm;
diff --git a/client/src/pages/admin/views/contests/ContestsList.tsx b/projects/client/src/pages/admin/views/contests/ContestsList.tsx
similarity index 100%
rename from client/src/pages/admin/views/contests/ContestsList.tsx
rename to projects/client/src/pages/admin/views/contests/ContestsList.tsx
diff --git a/client/src/pages/admin/views/executables/ExecutableForm.tsx b/projects/client/src/pages/admin/views/executables/ExecutableForm.tsx
similarity index 100%
rename from client/src/pages/admin/views/executables/ExecutableForm.tsx
rename to projects/client/src/pages/admin/views/executables/ExecutableForm.tsx
diff --git a/client/src/pages/admin/views/executables/ExecutablesList.tsx b/projects/client/src/pages/admin/views/executables/ExecutablesList.tsx
similarity index 100%
rename from client/src/pages/admin/views/executables/ExecutablesList.tsx
rename to projects/client/src/pages/admin/views/executables/ExecutablesList.tsx
diff --git a/client/src/pages/admin/views/judge-hosts/JudgeHostLogsViewer.tsx b/projects/client/src/pages/admin/views/judge-hosts/JudgeHostLogsViewer.tsx
similarity index 100%
rename from client/src/pages/admin/views/judge-hosts/JudgeHostLogsViewer.tsx
rename to projects/client/src/pages/admin/views/judge-hosts/JudgeHostLogsViewer.tsx
diff --git a/client/src/pages/admin/views/judge-hosts/JudgeHostsList.tsx b/projects/client/src/pages/admin/views/judge-hosts/JudgeHostsList.tsx
similarity index 100%
rename from client/src/pages/admin/views/judge-hosts/JudgeHostsList.tsx
rename to projects/client/src/pages/admin/views/judge-hosts/JudgeHostsList.tsx
diff --git a/client/src/pages/admin/views/languages/LanguageForm.tsx b/projects/client/src/pages/admin/views/languages/LanguageForm.tsx
similarity index 100%
rename from client/src/pages/admin/views/languages/LanguageForm.tsx
rename to projects/client/src/pages/admin/views/languages/LanguageForm.tsx
diff --git a/client/src/pages/admin/views/languages/LanguagesList.tsx b/projects/client/src/pages/admin/views/languages/LanguagesList.tsx
similarity index 100%
rename from client/src/pages/admin/views/languages/LanguagesList.tsx
rename to projects/client/src/pages/admin/views/languages/LanguagesList.tsx
diff --git a/client/src/pages/admin/views/problems/ProblemForm.tsx b/projects/client/src/pages/admin/views/problems/ProblemForm.tsx
similarity index 99%
rename from client/src/pages/admin/views/problems/ProblemForm.tsx
rename to projects/client/src/pages/admin/views/problems/ProblemForm.tsx
index e5adf40..05c5975 100644
--- a/client/src/pages/admin/views/problems/ProblemForm.tsx
+++ b/projects/client/src/pages/admin/views/problems/ProblemForm.tsx
@@ -134,7 +134,7 @@ const ProblemForm: DataTableItemForm<Problem> = observer(
         </div>
       </FormModal>
     );
-  },
+  }
 );
 
 export default ProblemForm;
diff --git a/projects/client/src/pages/admin/views/problems/ProblemView.tsx b/projects/client/src/pages/admin/views/problems/ProblemView.tsx
new file mode 100644
index 0000000..4c6a447
--- /dev/null
+++ b/projects/client/src/pages/admin/views/problems/ProblemView.tsx
@@ -0,0 +1,84 @@
+import { observer } from 'mobx-react';
+import React, { useEffect } from 'react';
+import { RouteChildrenProps } from 'react-router-dom';
+import { Problem } from '../../../../core/models';
+import { rootStore } from '../../../../core/stores/RootStore';
+import Spinner from '../../../shared/Spinner';
+import TestcasesList from './testcases/TestcasesList';
+
+const ProblemView: React.FC<RouteChildrenProps<{ id?: string }>> = observer(({ match }) => {
+  const {
+    problemsStore: { item, fetchById, rejudge },
+  } = rootStore;
+
+  useEffect(() => {
+    fetchById(parseInt(match!.params.id!)).catch(() => location.assign('/'));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [fetchById]);
+
+  return !item.id ? (
+    <Spinner className="rounded-md border shadow dark:border-gray-700" />
+  ) : (
+    <div className="grid grid-cols-2 p-4 pl-0 pb-0 overflow-hidden h-full dark:text-white">
+      <div className="flex flex-col overflow-hidden">
+        <div className="px-4">
+          <div className="bg-white divide-y border shadow rounded-md dark:bg-gray-800 dark:border-gray-700 dark:divide-gray-700">
+            <div className="flex p-3 items-center justify-between">
+              <div className="text-lg font-medium">{`Problem '${item.name}'`}</div>
+              <div
+                className="text-white p-2 px-3 bg-blue-500 hover:bg-blue-400 rounded cursor-pointer"
+                onClick={() => rejudge(item.id!)}
+              >
+                Rejudge
+              </div>
+            </div>
+            <div className="p-4">
+              <div className="border rounded-md dark:border-gray-700">
+                <table className="min-w-full">
+                  <tbody className="divide-y dark:divide-gray-700">
+                    <tr className="divide-x dark:divide-gray-700">
+                      <td className="p-2">ID</td>
+                      <td className="p-2">{item.id}</td>
+                    </tr>
+                    <tr className="divide-x bg-gray-100 dark:bg-gray-700 dark:divide-gray-800">
+                      <td className="p-2">Name</td>
+                      <td className="p-2">{item.name}</td>
+                    </tr>
+                    <tr className="divide-x dark:divide-gray-700">
+                      <td className="p-2">Time limit</td>
+                      <td className="p-2">{item.timeLimit} s</td>
+                    </tr>
+                    <tr className="divide-x bg-gray-100 dark:bg-gray-700 dark:divide-gray-800">
+                      <td className="p-2">Memory limit</td>
+                      <td className="p-2">{item.memoryLimit} Kb</td>
+                    </tr>
+                    <tr className="divide-x dark:divide-gray-700">
+                      <td className="p-2">Output limit</td>
+                      <td className="p-2">{item.outputLimit} Kb</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div className="p-4 overflow-hidden">
+          <TestcasesList problem={item as Problem} />
+        </div>
+      </div>
+      <div className="flex flex-col pb-4">
+        <div className="h-full bg-white p-4 border shadow rounded-md dark:bg-gray-800 dark:border-gray-700">
+          <embed
+            className="rounded-lg"
+            src={`data:${item.file?.type};base64,${item.file?.content.payload}`}
+            type={item.file?.type}
+            width="100%"
+            height="100%"
+          />
+        </div>
+      </div>
+    </div>
+  );
+});
+
+export default ProblemView;
diff --git a/client/src/pages/admin/views/problems/ProblemsList.tsx b/projects/client/src/pages/admin/views/problems/ProblemsList.tsx
similarity index 100%
rename from client/src/pages/admin/views/problems/ProblemsList.tsx
rename to projects/client/src/pages/admin/views/problems/ProblemsList.tsx
diff --git a/client/src/pages/admin/views/problems/testcases/TestcaseBulkUploader.tsx b/projects/client/src/pages/admin/views/problems/testcases/TestcaseBulkUploader.tsx
similarity index 99%
rename from client/src/pages/admin/views/problems/testcases/TestcaseBulkUploader.tsx
rename to projects/client/src/pages/admin/views/problems/testcases/TestcaseBulkUploader.tsx
index 347df4c..f28b971 100644
--- a/client/src/pages/admin/views/problems/testcases/TestcaseBulkUploader.tsx
+++ b/projects/client/src/pages/admin/views/problems/testcases/TestcaseBulkUploader.tsx
@@ -48,7 +48,7 @@ const TestcaseBulkUploader: React.FC<TestcaseBulkUploaderProps> = observer(({ pr
                 if (
                   data.some(
                     ({ input, output }) =>
-                      input.md5Sum === inputMD5Sum && output.md5Sum === outputMD5Sum,
+                      input.md5Sum === inputMD5Sum && output.md5Sum === outputMD5Sum
                   )
                 )
                   continue;
diff --git a/client/src/pages/admin/views/problems/testcases/TestcaseForm.tsx b/projects/client/src/pages/admin/views/problems/testcases/TestcaseForm.tsx
similarity index 99%
rename from client/src/pages/admin/views/problems/testcases/TestcaseForm.tsx
rename to projects/client/src/pages/admin/views/problems/testcases/TestcaseForm.tsx
index c338ba5..72ff9c0 100644
--- a/client/src/pages/admin/views/problems/testcases/TestcaseForm.tsx
+++ b/projects/client/src/pages/admin/views/problems/testcases/TestcaseForm.tsx
@@ -66,7 +66,7 @@ const TestcaseForm: DataTableItemForm<Testcase> = observer(
         <TextInput<Testcase> entity={testcase} field="description" label="Description" />
       </FormModal>
     );
-  },
+  }
 );
 
 export default TestcaseForm;
diff --git a/client/src/pages/admin/views/problems/testcases/TestcasesList.tsx b/projects/client/src/pages/admin/views/problems/testcases/TestcasesList.tsx
similarity index 99%
rename from client/src/pages/admin/views/problems/testcases/TestcasesList.tsx
rename to projects/client/src/pages/admin/views/problems/testcases/TestcasesList.tsx
index 6ce7df2..71cb323 100644
--- a/client/src/pages/admin/views/problems/testcases/TestcasesList.tsx
+++ b/projects/client/src/pages/admin/views/problems/testcases/TestcasesList.tsx
@@ -177,7 +177,7 @@ const TestcasesList: React.FC<TestcasesListProps> = observer(({ problem }) => {
           } else if (
             data.some(
               ({ input, output }) =>
-                input.md5Sum === testcase.input.md5Sum && output.md5Sum === testcase.output.md5Sum,
+                input.md5Sum === testcase.input.md5Sum && output.md5Sum === testcase.output.md5Sum
             )
           ) {
             toastsStore.error('This is a duplicate testcase, select different files');
diff --git a/client/src/pages/admin/views/submissions/SubmissionView.tsx b/projects/client/src/pages/admin/views/submissions/SubmissionView.tsx
similarity index 98%
rename from client/src/pages/admin/views/submissions/SubmissionView.tsx
rename to projects/client/src/pages/admin/views/submissions/SubmissionView.tsx
index 108ca25..4bfcc5a 100644
--- a/client/src/pages/admin/views/submissions/SubmissionView.tsx
+++ b/projects/client/src/pages/admin/views/submissions/SubmissionView.tsx
@@ -27,7 +27,7 @@ const SubmissionsView: React.FC<RouteChildrenProps<{ id?: string }>> = observer(
   useEffect(() => {
     if (submission) {
       setHighlightedJudging(
-        submission.judgings.slice().sort(dateComparator<Judging>('startTime', true))[0],
+        submission.judgings.slice().sort(dateComparator<Judging>('startTime', true))[0]
       );
     }
   }, [submission]);
diff --git a/client/src/pages/admin/views/submissions/SubmissionViewDetails.tsx b/projects/client/src/pages/admin/views/submissions/SubmissionViewDetails.tsx
similarity index 96%
rename from client/src/pages/admin/views/submissions/SubmissionViewDetails.tsx
rename to projects/client/src/pages/admin/views/submissions/SubmissionViewDetails.tsx
index b668d4a..a242e76 100644
--- a/client/src/pages/admin/views/submissions/SubmissionViewDetails.tsx
+++ b/projects/client/src/pages/admin/views/submissions/SubmissionViewDetails.tsx
@@ -52,7 +52,7 @@ const SubmissionViewDetails: React.FC<{
       textAlign: 'center',
       render: (judging) =>
         `${Math.floor(
-          judging.runs.reduce<number>((pMax, run) => Math.max(pMax, run.runTime), 0) * 1000,
+          judging.runs.reduce<number>((pMax, run) => Math.max(pMax, run.runTime), 0) * 1000
         )} ms`,
     },
     {
@@ -61,7 +61,7 @@ const SubmissionViewDetails: React.FC<{
       textAlign: 'center',
       render: (judging) =>
         `${Math.floor(
-          judging.runs.reduce<number>((pMax, run) => Math.max(pMax, run.runTime), 0) * 1000,
+          judging.runs.reduce<number>((pMax, run) => Math.max(pMax, run.runTime), 0) * 1000
         )} ms`,
     },
     {
@@ -72,7 +72,7 @@ const SubmissionViewDetails: React.FC<{
         formatRestTime(
           (new Date(submission.submitTime).getTime() -
             new Date(submission.contest.startTime).getTime()) /
-            1000,
+            1000
         ),
     },
     {
@@ -83,7 +83,7 @@ const SubmissionViewDetails: React.FC<{
         formatRestTime(
           (new Date(judging.startTime).getTime() -
             new Date(submission.contest.startTime).getTime()) /
-            1000,
+            1000
         ),
     },
   ];
@@ -93,7 +93,7 @@ const SubmissionViewDetails: React.FC<{
       <DataTable
         dataFetcher={() =>
           Promise.resolve(
-            submission.judgings.slice().sort(dateComparator<Judging>('startTime', true)),
+            submission.judgings.slice().sort(dateComparator<Judging>('startTime', true))
           )
         }
         dataDependencies={[submission]}
diff --git a/client/src/pages/admin/views/submissions/SubmissionViewHeader.tsx b/projects/client/src/pages/admin/views/submissions/SubmissionViewHeader.tsx
similarity index 100%
rename from client/src/pages/admin/views/submissions/SubmissionViewHeader.tsx
rename to projects/client/src/pages/admin/views/submissions/SubmissionViewHeader.tsx
diff --git a/client/src/pages/admin/views/submissions/SubmissionViewJudgingRuns.tsx b/projects/client/src/pages/admin/views/submissions/SubmissionViewJudgingRuns.tsx
similarity index 99%
rename from client/src/pages/admin/views/submissions/SubmissionViewJudgingRuns.tsx
rename to projects/client/src/pages/admin/views/submissions/SubmissionViewJudgingRuns.tsx
index e210323..a7bee9c 100644
--- a/client/src/pages/admin/views/submissions/SubmissionViewJudgingRuns.tsx
+++ b/projects/client/src/pages/admin/views/submissions/SubmissionViewJudgingRuns.tsx
@@ -26,7 +26,7 @@ const SubmissionsViewJudgingRuns: React.FC<{ judging?: Judging }> = observer(({
     if (run.testcase.id && !run.testcase.output.content) {
       run.testcase.output.content = await rootStore.testcasesStore.fetchContent(
         run.testcase.id,
-        'output',
+        'output'
       );
     }
     if (run.id && !run.runOutput.content) {
@@ -83,7 +83,7 @@ const SubmissionsViewJudgingRuns: React.FC<{ judging?: Judging }> = observer(({
                   {
                     'opacity-50': !run.runOutput.size,
                     'cursor-pointer hover:bg-red-50 dark:hover:bg-red-900': run.runOutput.size,
-                  },
+                  }
                 )}
                 onClick={() => (run.runOutput.size ? setRunViewData(run) : undefined)}
               >
diff --git a/client/src/pages/admin/views/submissions/SubmissionsFilters.tsx b/projects/client/src/pages/admin/views/submissions/SubmissionsFilters.tsx
similarity index 97%
rename from client/src/pages/admin/views/submissions/SubmissionsFilters.tsx
rename to projects/client/src/pages/admin/views/submissions/SubmissionsFilters.tsx
index 5df3102..53d25ca 100644
--- a/client/src/pages/admin/views/submissions/SubmissionsFilters.tsx
+++ b/projects/client/src/pages/admin/views/submissions/SubmissionsFilters.tsx
@@ -17,7 +17,7 @@ const SubmissionsFilters: React.FC<{
   }, [fetchAllLanguages]);
 
   return (
-    <div className="grid sm:grid-cols-4 gap-4 p-4 bg-white rounded border shadow dark:bg-gray-800 dark:border-gray-700">
+    <div className="grid sm:grid-cols-4 gap-4 p-4 bg-white rounded shadow dark:bg-gray-800">
       <DropDownInput<Filters>
         entity={filters}
         field="problems"
diff --git a/client/src/pages/admin/views/submissions/SubmissionsList.tsx b/projects/client/src/pages/admin/views/submissions/SubmissionsList.tsx
similarity index 99%
rename from client/src/pages/admin/views/submissions/SubmissionsList.tsx
rename to projects/client/src/pages/admin/views/submissions/SubmissionsList.tsx
index 88731cc..d5dcac2 100644
--- a/client/src/pages/admin/views/submissions/SubmissionsList.tsx
+++ b/projects/client/src/pages/admin/views/submissions/SubmissionsList.tsx
@@ -41,7 +41,7 @@ const SubmissionsList: React.FC = observer(() => {
           {formatRestTime(
             (new Date(submission.submitTime).getTime() -
               new Date(currentContest?.startTime ?? 0).getTime()) /
-              1000,
+              1000
           )}
         </div>
       ),
diff --git a/client/src/pages/admin/views/submissions/SubmissionsListPagination.tsx b/projects/client/src/pages/admin/views/submissions/SubmissionsListPagination.tsx
similarity index 97%
rename from client/src/pages/admin/views/submissions/SubmissionsListPagination.tsx
rename to projects/client/src/pages/admin/views/submissions/SubmissionsListPagination.tsx
index 866ac75..45d3127 100644
--- a/client/src/pages/admin/views/submissions/SubmissionsListPagination.tsx
+++ b/projects/client/src/pages/admin/views/submissions/SubmissionsListPagination.tsx
@@ -44,7 +44,7 @@ const SubmissionsListPagination: React.FC<Props> = ({
                 'p-2 px-4 border border-r-0 border-gray-400 cursor-pointer hover:bg-gray-200 dark:hover:bg-gray-600',
                 {
                   'bg-gray-100 dark:bg-gray-700': index === currentPage,
-                },
+                }
               )}
               onClick={() => setCurrentPage(index)}
             >
@@ -66,8 +66,8 @@ const SubmissionsListPagination: React.FC<Props> = ({
             onClick={() =>
               setCurrentPage(
                 Math.floor(
-                  totalItems && !(totalItems % 10) ? (totalItems - 1) / 10 : totalItems / 10,
-                ),
+                  totalItems && !(totalItems % 10) ? (totalItems - 1) / 10 : totalItems / 10
+                )
               )
             }
           >
diff --git a/client/src/pages/admin/views/team-category/TeamCategoriesList.tsx b/projects/client/src/pages/admin/views/team-category/TeamCategoriesList.tsx
similarity index 100%
rename from client/src/pages/admin/views/team-category/TeamCategoriesList.tsx
rename to projects/client/src/pages/admin/views/team-category/TeamCategoriesList.tsx
diff --git a/client/src/pages/admin/views/team-category/TeamCategoryForm.tsx b/projects/client/src/pages/admin/views/team-category/TeamCategoryForm.tsx
similarity index 100%
rename from client/src/pages/admin/views/team-category/TeamCategoryForm.tsx
rename to projects/client/src/pages/admin/views/team-category/TeamCategoryForm.tsx
diff --git a/client/src/pages/admin/views/teams/TeamForm.tsx b/projects/client/src/pages/admin/views/teams/TeamForm.tsx
similarity index 94%
rename from client/src/pages/admin/views/teams/TeamForm.tsx
rename to projects/client/src/pages/admin/views/teams/TeamForm.tsx
index 8e4350c..b715e09 100644
--- a/client/src/pages/admin/views/teams/TeamForm.tsx
+++ b/projects/client/src/pages/admin/views/teams/TeamForm.tsx
@@ -69,11 +69,15 @@ const TeamForm: DataTableItemForm<Team> = observer(({ item: team, isOpen, onClos
         required
         options={users.filter(
           (user) =>
-            !user.team || team.users?.some((t) => t.id === user.id) || user.team.id === team.id,
+            !user.team || team.users?.some((t) => t.id === user.id) || user.team.id === team.id
         )}
         optionsTextField="name"
         errors={errors}
         setErrors={setErrors}
+        onUnselect={(unselected) => {
+          const user = users.find((user) => user.id === unselected.id);
+          if (user) user.team = undefined;
+        }}
       />
       <div className="grid sm:grid-cols-2 gap-2">
         <NumberInput<Team> entity={team} field="penalty" label="Penalty Time" defaultValue={0} />
diff --git a/client/src/pages/admin/views/teams/TeamsList.tsx b/projects/client/src/pages/admin/views/teams/TeamsList.tsx
similarity index 100%
rename from client/src/pages/admin/views/teams/TeamsList.tsx
rename to projects/client/src/pages/admin/views/teams/TeamsList.tsx
diff --git a/client/src/pages/admin/views/users/UserForm.tsx b/projects/client/src/pages/admin/views/users/UserForm.tsx
similarity index 100%
rename from client/src/pages/admin/views/users/UserForm.tsx
rename to projects/client/src/pages/admin/views/users/UserForm.tsx
diff --git a/client/src/pages/admin/views/users/UsersList.tsx b/projects/client/src/pages/admin/views/users/UsersList.tsx
similarity index 89%
rename from client/src/pages/admin/views/users/UsersList.tsx
rename to projects/client/src/pages/admin/views/users/UsersList.tsx
index 3bea113..7152110 100644
--- a/client/src/pages/admin/views/users/UsersList.tsx
+++ b/projects/client/src/pages/admin/views/users/UsersList.tsx
@@ -6,13 +6,6 @@ import { rootStore } from '../../../../core/stores/RootStore';
 import DataTable, { ListPageTableColumn } from '../../../shared/data-table/DataTable';
 import UserForm from './UserForm';
 
-const rolesColors: Record<string, 'green' | 'yellow' | 'red' | 'blue'> = {
-  admin: 'red',
-  jury: 'yellow',
-  'judge-host': 'blue',
-  team: 'green',
-};
-
 const UsersList: React.FC = observer(() => {
   const {
     profile,
@@ -69,7 +62,6 @@ const UsersList: React.FC = observer(() => {
       withoutActions={!isUserAdmin}
       canDelete={(item) => !!profile && item.username !== profile.username}
       onFormSubmit={(item) => (item.id ? update(item) : create(item))}
-      rowBackgroundColor={(item) => rolesColors[item.role.name]}
     />
   );
 });
diff --git a/client/src/pages/public/PublicLayout.tsx b/projects/client/src/pages/public/PublicLayout.tsx
similarity index 100%
rename from client/src/pages/public/PublicLayout.tsx
rename to projects/client/src/pages/public/PublicLayout.tsx
diff --git a/client/src/pages/public/PublicNavbar.tsx b/projects/client/src/pages/public/PublicNavbar.tsx
similarity index 94%
rename from client/src/pages/public/PublicNavbar.tsx
rename to projects/client/src/pages/public/PublicNavbar.tsx
index 63ca5ef..394dee2 100644
--- a/client/src/pages/public/PublicNavbar.tsx
+++ b/projects/client/src/pages/public/PublicNavbar.tsx
@@ -11,6 +11,8 @@ const PublicNavbar: React.FC = observer(() => {
   const [currentTab, setCurrentTab] = useState(location.pathname.replace(/\/?/g, ''));
   const history = useHistory();
 
+  history.listen(() => setCurrentTab(location.pathname.replace(/\/?/g, '')));
+
   const onLinkClick = (tab: Tabs) => {
     setCurrentTab(tab);
     history.push(`/${tab}`);
diff --git a/projects/client/src/pages/public/views/HomeView.tsx b/projects/client/src/pages/public/views/HomeView.tsx
new file mode 100644
index 0000000..eb5d490
--- /dev/null
+++ b/projects/client/src/pages/public/views/HomeView.tsx
@@ -0,0 +1,15 @@
+import { observer } from 'mobx-react';
+import React from 'react';
+import { rootStore } from '../../../core/stores/RootStore';
+import { NoActiveContest } from '../../shared/NoActiveContest';
+import Scoreboard from '../../shared/Scoreboard';
+
+const HomeView: React.FC = observer(() => {
+  const {
+    publicStore: { currentContest },
+  } = rootStore;
+
+  return currentContest ? <Scoreboard contest={currentContest} /> : <NoActiveContest />;
+});
+
+export default HomeView;
diff --git a/client/src/pages/shared/ActiveContestSelector.tsx b/projects/client/src/pages/shared/ActiveContestSelector.tsx
similarity index 99%
rename from client/src/pages/shared/ActiveContestSelector.tsx
rename to projects/client/src/pages/shared/ActiveContestSelector.tsx
index 82182c8..6e4ee34 100644
--- a/client/src/pages/shared/ActiveContestSelector.tsx
+++ b/projects/client/src/pages/shared/ActiveContestSelector.tsx
@@ -75,7 +75,7 @@ const ActiveContestSelector: React.FC<Props> = observer(({ className }) => {
                 'flex items-center px-3 py-2 cursor-pointer rounded-md m-1 hover:bg-gray-200 dark:hover:bg-gray-700',
                 {
                   'bg-gray-200 dark:bg-gray-700': contest.id === currentContest?.id,
-                },
+                }
               )}
               onClick={() => setCurrentContest(contest.id)}
             >
diff --git a/client/src/pages/shared/CodeEditor.tsx b/projects/client/src/pages/shared/CodeEditor.tsx
similarity index 100%
rename from client/src/pages/shared/CodeEditor.tsx
rename to projects/client/src/pages/shared/CodeEditor.tsx
diff --git a/client/src/pages/shared/ContestCountdown.tsx b/projects/client/src/pages/shared/ContestCountdown.tsx
similarity index 100%
rename from client/src/pages/shared/ContestCountdown.tsx
rename to projects/client/src/pages/shared/ContestCountdown.tsx
diff --git a/client/src/pages/shared/DarkModeSwitcher.tsx b/projects/client/src/pages/shared/DarkModeSwitcher.tsx
similarity index 99%
rename from client/src/pages/shared/DarkModeSwitcher.tsx
rename to projects/client/src/pages/shared/DarkModeSwitcher.tsx
index a1aebe7..211b0eb 100644
--- a/client/src/pages/shared/DarkModeSwitcher.tsx
+++ b/projects/client/src/pages/shared/DarkModeSwitcher.tsx
@@ -21,7 +21,7 @@ export const DarkModeSwitcher: React.FC<{ className?: string }> = observer(({ cl
         {
           'bg-blue-700': darkMode,
           'bg-gray-100': !darkMode,
-        },
+        }
       )}
     >
       <div
diff --git a/client/src/pages/shared/DiffViewer.tsx b/projects/client/src/pages/shared/DiffViewer.tsx
similarity index 100%
rename from client/src/pages/shared/DiffViewer.tsx
rename to projects/client/src/pages/shared/DiffViewer.tsx
diff --git a/client/src/pages/shared/Login.tsx b/projects/client/src/pages/shared/Login.tsx
similarity index 100%
rename from client/src/pages/shared/Login.tsx
rename to projects/client/src/pages/shared/Login.tsx
diff --git a/client/src/pages/shared/Logout.tsx b/projects/client/src/pages/shared/Logout.tsx
similarity index 100%
rename from client/src/pages/shared/Logout.tsx
rename to projects/client/src/pages/shared/Logout.tsx
diff --git a/client/src/pages/shared/NavBar.tsx b/projects/client/src/pages/shared/NavBar.tsx
similarity index 99%
rename from client/src/pages/shared/NavBar.tsx
rename to projects/client/src/pages/shared/NavBar.tsx
index 814fa1e..e721333 100644
--- a/client/src/pages/shared/NavBar.tsx
+++ b/projects/client/src/pages/shared/NavBar.tsx
@@ -27,7 +27,7 @@ const NavBar: React.FC<Props> = ({ logo, leftItems, rightItems }) => {
             {
               'bg-gray-900 text-white': active,
               'text-gray-300 hover:bg-gray-700 hover:text-white': !active,
-            },
+            }
           )}
           key={`item-${index}`}
           onClick={onClick}
diff --git a/client/src/pages/shared/NoActiveContest.tsx b/projects/client/src/pages/shared/NoActiveContest.tsx
similarity index 100%
rename from client/src/pages/shared/NoActiveContest.tsx
rename to projects/client/src/pages/shared/NoActiveContest.tsx
diff --git a/client/src/pages/shared/ProblemSet.tsx b/projects/client/src/pages/shared/ProblemSet.tsx
similarity index 99%
rename from client/src/pages/shared/ProblemSet.tsx
rename to projects/client/src/pages/shared/ProblemSet.tsx
index 5acbe2a..580e353 100644
--- a/client/src/pages/shared/ProblemSet.tsx
+++ b/projects/client/src/pages/shared/ProblemSet.tsx
@@ -34,7 +34,7 @@ const ProblemSet: React.FC<{ listMode?: boolean }> = observer(({ listMode }) =>
           .sort(dateComparator<ScoreCache>(isUserJury ? 'restrictedSolveTime' : 'solveTime'))
           .shift();
         const veryFirstToSolve =
-          shift?.team.id === profile?.team.id && shift?.problem.id === problem.id;
+          shift?.team.id === profile?.team?.id && shift?.problem.id === problem.id;
         const nbrBalloons = sc?.correct ? (veryFirstToSolve ? 3 : sc.firstToSolve ? 2 : 1) : 0;
         return (
           <div className="flex justify-between w-full">
@@ -75,7 +75,7 @@ const ProblemSet: React.FC<{ listMode?: boolean }> = observer(({ listMode }) =>
   const fetchAll = () =>
     currentContest
       ? fetchProblems(currentContest.id).then((problems) =>
-          problems.map((problem) => ({ ...problem, id: problem.shortName as string })),
+          problems.map((problem) => ({ ...problem, id: problem.shortName as string }))
         )
       : Promise.resolve([]);
 
@@ -155,7 +155,7 @@ const ProblemSet: React.FC<{ listMode?: boolean }> = observer(({ listMode }) =>
         item={submission ?? ({} as Submission)}
         onClose={() => setSubmission(undefined)}
         onSubmit={async (submission) => {
-          await sendSubmission(currentContest!.id, profile!.team.id, submission);
+          await sendSubmission(currentContest!.id, profile!.team!.id, submission);
           setSubmission(undefined);
         }}
       />
diff --git a/client/src/pages/shared/Scoreboard.tsx b/projects/client/src/pages/shared/Scoreboard.tsx
similarity index 69%
rename from client/src/pages/shared/Scoreboard.tsx
rename to projects/client/src/pages/shared/Scoreboard.tsx
index 973da59..5c531a8 100644
--- a/client/src/pages/shared/Scoreboard.tsx
+++ b/projects/client/src/pages/shared/Scoreboard.tsx
@@ -3,8 +3,8 @@ import classNames from 'classnames';
 import { observer } from 'mobx-react';
 import React, { useEffect, useState } from 'react';
 import { formatRestTime, getRGBColorContrast } from '../../core/helpers';
+import { Contest } from '../../core/models';
 import { rootStore } from '../../core/stores/RootStore';
-import { NoActiveContest } from './NoActiveContest';
 import Tooltip from './tooltip/Tooltip';
 
 type TeamProblemScore = {
@@ -24,14 +24,14 @@ type TeamStandingRow = {
   problemsScores: TeamProblemScore[];
 };
 
-type Props = { compact?: boolean; className?: string };
+type Props = { contest: Contest; compact?: boolean; className?: string };
 
-const Scoreboard: React.FC<Props> = observer(({ compact, className }) => {
+const Scoreboard: React.FC<Props> = observer(({ contest, compact, className }) => {
   const [standing, setStanding] = useState<TeamStandingRow[]>([]);
   const {
     profile,
     isUserJury,
-    publicStore: { currentContest, scoreCaches },
+    publicStore: { scoreCaches },
     contestsStore: { refreshScoreboardCache },
   } = rootStore;
 
@@ -68,7 +68,7 @@ const Scoreboard: React.FC<Props> = observer(({ compact, className }) => {
           : Math.floor(
               (submissions - 1) * 20 +
                 (new Date(solveTime).getTime() - new Date(contest.startTime || '').getTime()) /
-                  60000,
+                  60000
             );
         if (correct) {
           cache[team.id].solvedProblems++;
@@ -83,7 +83,7 @@ const Scoreboard: React.FC<Props> = observer(({ compact, className }) => {
             (new Date(isUserJury ? restrictedSolveTime : solveTime).getTime() -
               new Date(contest.startTime).getTime()) /
               1000,
-            false,
+            false
           ),
           numberOfAttempts: isUserJury ? restrictedSubmissions : submissions,
         });
@@ -95,83 +95,87 @@ const Scoreboard: React.FC<Props> = observer(({ compact, className }) => {
               ? a.totalScore === b.totalScore
                 ? a.teamName.localeCompare(b.teamName)
                 : a.totalScore - b.totalScore
-              : b.solvedProblems - a.solvedProblems,
+              : b.solvedProblems - a.solvedProblems
           )
           .map((row) => {
             row.problemsScores.sort((a, b) => a.problemName.localeCompare(b.problemName));
             return row;
-          }),
+          })
       );
     }
   }, [scoreCaches, isUserJury]);
 
   return (
     <div className={classNames(className, 'flex justify-center dark:text-white p-8 max-w-full')}>
-      {!currentContest ? (
-        <NoActiveContest />
-      ) : (
-        <div className="max-w-full p-8 bg-white rounded-xl border shadow select-none dark:bg-gray-800 dark:border-gray-700">
-          {!compact && (
-            <div className="flex items-center justify-center text-3xl mb-8 font-medium gap-x-1">
-              Scoreboard of {currentContest.name}
-              {isUserJury && (
-                <Tooltip content="Refresh" position="right">
-                  <div
-                    className="p-2 hover:bg-gray-300 rounded-full cursor-pointer dark:hover:bg-gray-700"
-                    onClick={() => refreshScoreboardCache(currentContest.id)}
-                  >
-                    <RefreshIcon className="h-8 w-8" />
+      <div className="max-w-full p-8 bg-white rounded-xl border shadow select-none dark:bg-gray-800 dark:border-gray-700">
+        {!compact && (
+          <div className="flex items-center justify-center text-3xl mb-8 font-medium gap-x-1">
+            Scoreboard of {contest.name}
+            {isUserJury && (
+              <Tooltip content="Refresh" position="right">
+                <div
+                  className="p-2 hover:bg-gray-300 rounded-full cursor-pointer dark:hover:bg-gray-700"
+                  onClick={() => refreshScoreboardCache(contest.id)}
+                >
+                  <RefreshIcon className="h-8 w-8" />
+                </div>
+              </Tooltip>
+            )}
+          </div>
+        )}
+        <div className="overflow-auto">
+          <table>
+            <thead>
+              <tr>
+                <th className="p-1">
+                  <div className="p-3 bg-gray-100 dark:bg-gray-700 shadow rounded-xl">#</div>
+                </th>
+                <th className="p-1">
+                  <div className="w-52 p-3 bg-gray-100 dark:bg-gray-700 shadow rounded-xl text-left">
+                    Team
                   </div>
-                </Tooltip>
-              )}
-            </div>
-          )}
-          <div className="overflow-auto">
-            <table>
-              <thead>
-                <tr>
-                  <th className="p-1">
-                    <div className="p-3 bg-gray-100 dark:bg-gray-700 shadow rounded-xl">#</div>
-                  </th>
-                  <th className="p-1">
-                    <div className="p-3 bg-gray-100 dark:bg-gray-700 shadow rounded-xl text-left">
-                      Team
-                    </div>
-                  </th>
-                  <th className="p-1">
-                    <div className="p-3 bg-gray-100 dark:bg-gray-700 shadow rounded-xl">=</div>
-                  </th>
-                  <th className="p-1">
-                    <div className="p-3 bg-gray-100 dark:bg-gray-700 shadow rounded-xl">Score</div>
-                  </th>
-                  {currentContest.problems
-                    .slice()
-                    .sort((a, b) => a.shortName.localeCompare(b.shortName))
-                    .map((problem) => (
-                      <th key={problem.shortName} className="p-1">
-                        <Tooltip
-                          content={`${problem.shortName} - ${problem.problem.name}`}
-                          position="top"
+                </th>
+                <th className="p-1">
+                  <div className="p-3 bg-gray-100 dark:bg-gray-700 shadow rounded-xl">=</div>
+                </th>
+                <th className="p-1">
+                  <div className="p-3 bg-gray-100 dark:bg-gray-700 shadow rounded-xl">Score</div>
+                </th>
+                {contest.problems
+                  .slice()
+                  .sort((a, b) => a.shortName.localeCompare(b.shortName))
+                  .map((problem) => (
+                    <th key={problem.shortName} className="p-1">
+                      <Tooltip
+                        content={`${problem.shortName} - ${problem.problem.name}`}
+                        position="top"
+                      >
+                        <div
+                          className={classNames('p-3 shadow rounded-xl truncate w-20', {
+                            'text-white': getRGBColorContrast(problem.color) < 0.5,
+                            'text-black': getRGBColorContrast(problem.color) > 0.5,
+                          })}
+                          style={{ backgroundColor: problem.color }}
                         >
-                          <div
-                            className={classNames('p-3 shadow rounded-xl truncate w-20', {
-                              'text-white': getRGBColorContrast(problem.color) < 0.5,
-                              'text-black': getRGBColorContrast(problem.color) > 0.5,
-                            })}
-                            style={{ backgroundColor: problem.color }}
-                          >
-                            {problem.shortName}
-                          </div>
-                        </Tooltip>
-                      </th>
-                    ))}
+                          {problem.shortName}
+                        </div>
+                      </Tooltip>
+                    </th>
+                  ))}
+              </tr>
+            </thead>
+            <tbody>
+              {!standing.length ? (
+                <tr>
+                  <td className="text-center p-4 text-gray-500" colSpan={100}>
+                    No teams
+                  </td>
                 </tr>
-              </thead>
-              <tbody>
-                {standing.map(
+              ) : (
+                standing.map(
                   ({ teamId, teamName, solvedProblems, totalScore, problemsScores }, index) => {
                     return (
-                      (!compact || teamId === profile?.team.id) && (
+                      (!compact || teamId === profile?.team?.id) && (
                         <tr key={`team-${teamId}`}>
                           <td className="p-1">
                             <div className="flex items-center justify-center p-3 h-14 bg-gray-100 dark:bg-gray-700 shadow rounded-xl">
@@ -215,7 +219,7 @@ const Scoreboard: React.FC<Props> = observer(({ compact, className }) => {
                                     'bg-red-600': getScoreboardCellColor(problemScore) === 'red',
                                     'bg-gray-100 dark:bg-gray-700':
                                       getScoreboardCellColor(problemScore) === 'white',
-                                  },
+                                  }
                                 )}
                               >
                                 {problemScore.numberOfAttempts ? (
@@ -235,13 +239,13 @@ const Scoreboard: React.FC<Props> = observer(({ compact, className }) => {
                         </tr>
                       )
                     );
-                  },
-                )}
-              </tbody>
-            </table>
-          </div>
+                  }
+                )
+              )}
+            </tbody>
+          </table>
         </div>
-      )}
+      </div>
     </div>
   );
 });
@@ -249,7 +253,7 @@ const Scoreboard: React.FC<Props> = observer(({ compact, className }) => {
 export default Scoreboard;
 
 function getScoreboardCellColor(
-  problemScore: TeamProblemScore,
+  problemScore: TeamProblemScore
 ): 'white' | 'green-dark' | 'green' | 'yellow' | 'red' {
   if (problemScore.firstToSolve) return 'green-dark';
   if (problemScore.correct) return 'green';
diff --git a/client/src/pages/shared/Spinner.tsx b/projects/client/src/pages/shared/Spinner.tsx
similarity index 98%
rename from client/src/pages/shared/Spinner.tsx
rename to projects/client/src/pages/shared/Spinner.tsx
index 3a96411..b9a6eaa 100644
--- a/client/src/pages/shared/Spinner.tsx
+++ b/projects/client/src/pages/shared/Spinner.tsx
@@ -10,7 +10,7 @@ const Spinner: React.FC<Props> = ({ className, fullScreen }) => (
       'flex items-center justify-center h-full w-full bg-white dark:bg-gray-800',
       {
         'h-screen': fullScreen,
-      },
+      }
     )}
   >
     <svg
diff --git a/client/src/pages/shared/ToastContainer.tsx b/projects/client/src/pages/shared/ToastContainer.tsx
similarity index 99%
rename from client/src/pages/shared/ToastContainer.tsx
rename to projects/client/src/pages/shared/ToastContainer.tsx
index e11f174..2ead639 100644
--- a/client/src/pages/shared/ToastContainer.tsx
+++ b/projects/client/src/pages/shared/ToastContainer.tsx
@@ -40,7 +40,7 @@ const ToastContainer: React.FC = observer(() => {
                 'border-green-500': colors[type] === 'green',
                 'border-yellow-500': colors[type] === 'yellow',
                 'border-red-500': colors[type] === 'red',
-              },
+              }
             )}
           >
             <div className="flex items-center justify-center">
diff --git a/projects/client/src/pages/shared/chat-box/ChatBox.tsx b/projects/client/src/pages/shared/chat-box/ChatBox.tsx
new file mode 100644
index 0000000..b6dec18
--- /dev/null
+++ b/projects/client/src/pages/shared/chat-box/ChatBox.tsx
@@ -0,0 +1,62 @@
+import { observer } from 'mobx-react';
+import React, { useEffect } from 'react';
+import { compareRoles } from '../../../core/helpers';
+import { Clarification } from '../../../core/models';
+import { rootStore } from '../../../core/stores/RootStore';
+import { DataTableItemForm } from '../data-table/DataTable';
+import ChatBoxHeader from './ChatBoxHeader';
+import ChatBoxInput from './ChatBoxInput';
+import ChatBoxMessageList from './ChatBoxMessageList';
+
+const ChatBox: DataTableItemForm<Clarification> = observer(({ item: clarification }) => {
+  const {
+    isUserJury,
+    profile,
+    publicStore: { currentContest },
+    clarificationsStore: {
+      item,
+      setItem,
+      setClarificationMessageAsSeen,
+      fetchAllForContest,
+      fetchAllForTeam,
+    },
+  } = rootStore;
+
+  useEffect(() => {
+    setItem(clarification);
+  }, [setItem, clarification]);
+
+  useEffect(() => {
+    if (currentContest) {
+      Promise.all(
+        item.messages.map(async (message) => {
+          if (!compareRoles(profile!, message.sentBy) && !message.seen) {
+            await setClarificationMessageAsSeen(currentContest.id, item.id, message.id);
+            return true;
+          }
+          return false;
+        })
+      ).then<any>(
+        (res) => res.some(Boolean) && isUserJury && fetchAllForContest(currentContest.id)
+      );
+    }
+  }, [
+    item,
+    profile,
+    isUserJury,
+    currentContest,
+    setClarificationMessageAsSeen,
+    fetchAllForContest,
+    fetchAllForTeam,
+  ]);
+
+  return (
+    <div className="flex flex-col h-full gap-y-3 dark:text-white">
+      <ChatBoxHeader clarification={item} />
+      <ChatBoxMessageList clarification={item} />
+      {(item.team || isUserJury) && <ChatBoxInput clarification={item} />}
+    </div>
+  );
+});
+
+export default ChatBox;
diff --git a/client/src/pages/shared/chat-box/ChatBoxHeader.tsx b/projects/client/src/pages/shared/chat-box/ChatBoxHeader.tsx
similarity index 91%
rename from client/src/pages/shared/chat-box/ChatBoxHeader.tsx
rename to projects/client/src/pages/shared/chat-box/ChatBoxHeader.tsx
index 7a46221..d9f0f3f 100644
--- a/client/src/pages/shared/chat-box/ChatBoxHeader.tsx
+++ b/projects/client/src/pages/shared/chat-box/ChatBoxHeader.tsx
@@ -26,7 +26,12 @@ const ChatBoxHeader: React.FC<{ clarification: Clarification }> = observer(({ cl
     <div>
       {clarification.id ? (
         <div className="text-2xl font-medium mb-2">
-          ({clarification.id}) {clarification.general ? 'General' : clarification.problem?.name}
+          {clarification.general
+            ? 'General'
+            : `${
+                currentContest?.problems.find((p) => p.problem.id === clarification.problem?.id)
+                  ?.shortName
+              } - ${clarification.problem?.name}`}
         </div>
       ) : (
         <form
diff --git a/client/src/pages/shared/chat-box/ChatBoxInput.tsx b/projects/client/src/pages/shared/chat-box/ChatBoxInput.tsx
similarity index 57%
rename from client/src/pages/shared/chat-box/ChatBoxInput.tsx
rename to projects/client/src/pages/shared/chat-box/ChatBoxInput.tsx
index 26f7777..d9c5ca5 100644
--- a/client/src/pages/shared/chat-box/ChatBoxInput.tsx
+++ b/projects/client/src/pages/shared/chat-box/ChatBoxInput.tsx
@@ -20,22 +20,21 @@ const ChatBoxInput: React.FC<{ clarification: Clarification }> = observer(({ cla
   };
 
   return (
-    <div>
-      <form className="flex gap-2" onSubmit={onSubmit}>
-        <textarea
-          className="p-2 border border-gray-200 rounded-lg w-full dark:bg-gray-800 dark:border-gray-700"
-          value={message}
-          placeholder="Write a reply..."
-          onChange={({ target: { value } }) => setMessage(value)}
-        />
-        <button
-          type="submit"
-          className="p-2 px-6 bg-blue-600 rounded-lg hover:bg-blue-400 dark:hover:bg-blue-900"
-        >
-          <PaperAirplaneIcon className="text-white h-8 w-8" />
-        </button>
-      </form>
-    </div>
+    <form className="flex gap-2" onSubmit={onSubmit}>
+      <textarea
+        className="p-2 border border-gray-200 rounded-lg w-full dark:bg-gray-800 dark:border-gray-700"
+        value={message}
+        placeholder="Write a reply..."
+        onChange={({ target: { value } }) => setMessage(value)}
+      />
+      <button
+        type="submit"
+        className="p-2 px-6 bg-blue-600 rounded-lg hover:bg-blue-400 dark:hover:bg-blue-900 disabled:opacity-50 disabled:cursor-default"
+        disabled={(!clarification.general && !clarification.problem) || !message}
+      >
+        <PaperAirplaneIcon className="text-white h-8 w-8" />
+      </button>
+    </form>
   );
 });
 
diff --git a/projects/client/src/pages/shared/chat-box/ChatBoxMessageList.tsx b/projects/client/src/pages/shared/chat-box/ChatBoxMessageList.tsx
new file mode 100644
index 0000000..ca523bd
--- /dev/null
+++ b/projects/client/src/pages/shared/chat-box/ChatBoxMessageList.tsx
@@ -0,0 +1,43 @@
+import classNames from 'classnames';
+import { observer } from 'mobx-react';
+import moment from 'moment';
+import React from 'react';
+import { compareRoles } from '../../../core/helpers';
+import { Clarification } from '../../../core/models';
+import { rootStore } from '../../../core/stores/RootStore';
+
+type Props = { clarification: Clarification };
+
+const ChatBoxMessageList: React.FC<Props> = observer(({ clarification }) => {
+  const { profile } = rootStore;
+
+  return (
+    <div className="flex flex-col gap-1 p-3 h-full overflow-y-auto border border-gray-200 rounded-lg dark:border-gray-700">
+      {clarification.messages.map((message, index) => (
+        <div key={index}>
+          <div
+            className={classNames('flex flex-col', {
+              'float-right items-end': compareRoles(profile!, message.sentBy),
+              'float-left': !compareRoles(profile!, message.sentBy),
+            })}
+          >
+            <div
+              className={classNames('p-3 px-4 rounded-2xl max-w-max', {
+                'bg-gray-100 dark:bg-gray-900': compareRoles(profile!, message.sentBy),
+                'bg-gray-300 dark:bg-gray-700': !compareRoles(profile!, message.sentBy),
+              })}
+              ref={(el) => setTimeout(() => el?.scrollIntoView(), 10)}
+            >
+              {message.content}
+            </div>
+            <div className="px-2 text-sm text-gray-600 dark:text-gray-400">
+              Sent {moment(message.sentTime).fromNow()} By {message.sentBy.username}
+            </div>
+          </div>
+        </div>
+      ))}
+    </div>
+  );
+});
+
+export default ChatBoxMessageList;
diff --git a/client/src/pages/shared/data-table/DataTable.tsx b/projects/client/src/pages/shared/data-table/DataTable.tsx
similarity index 97%
rename from client/src/pages/shared/data-table/DataTable.tsx
rename to projects/client/src/pages/shared/data-table/DataTable.tsx
index a8f37a0..90e4218 100644
--- a/client/src/pages/shared/data-table/DataTable.tsx
+++ b/projects/client/src/pages/shared/data-table/DataTable.tsx
@@ -104,7 +104,7 @@ function DataTable<T extends { id: number | string }>({
   };
 
   return (
-    <div className="flex flex-col overflow-hidden gap-y-4 text-black dark:text-white">
+    <div className="flex flex-col p-4 overflow-hidden gap-y-4 text-black dark:text-white">
       {header && (
         <DataTableActionBar
           header={header}
diff --git a/client/src/pages/shared/data-table/DataTableActionBar.tsx b/projects/client/src/pages/shared/data-table/DataTableActionBar.tsx
similarity index 88%
rename from client/src/pages/shared/data-table/DataTableActionBar.tsx
rename to projects/client/src/pages/shared/data-table/DataTableActionBar.tsx
index f4ddf4d..9d2b29c 100644
--- a/client/src/pages/shared/data-table/DataTableActionBar.tsx
+++ b/projects/client/src/pages/shared/data-table/DataTableActionBar.tsx
@@ -11,7 +11,7 @@ type Props = {
 
 const DataTableActionBar: React.FC<Props> = ({ header, canAdd, onAdd, onRefresh }) => {
   return (
-    <div className="flex items-center shadow rounded-md border w-full justify-between px-4 py-2 bg-white dark:bg-gray-800 dark:border-gray-700">
+    <div className="flex items-center shadow rounded-md w-full justify-between px-4 py-2 bg-white dark:bg-gray-800">
       <div className="text-xl">{header}</div>
       <div className="flex items-center space-x-2">
         {onRefresh && (
diff --git a/client/src/pages/shared/data-table/DataTableBody.tsx b/projects/client/src/pages/shared/data-table/DataTableBody.tsx
similarity index 96%
rename from client/src/pages/shared/data-table/DataTableBody.tsx
rename to projects/client/src/pages/shared/data-table/DataTableBody.tsx
index 63c1ac3..61003cb 100644
--- a/client/src/pages/shared/data-table/DataTableBody.tsx
+++ b/projects/client/src/pages/shared/data-table/DataTableBody.tsx
@@ -66,8 +66,8 @@ function DataTableBody<T extends { id: number | string }>({
             .slice()
             .sort((a, b) =>
               direction === 'ascending'
-                ? generalComparator(a[column], b[column])
-                : generalComparator(b[column], a[column]),
+                ? generalComparator()(a[column], b[column])
+                : generalComparator()(b[column], a[column])
             ),
         };
       }
@@ -86,14 +86,14 @@ function DataTableBody<T extends { id: number | string }>({
     } else {
       setSortState({
         column: field,
-        data: data.slice().sort((a, b) => generalComparator(a[field], b[field])),
+        data: data.slice().sort((a, b) => generalComparator()(a[field], b[field])),
         direction: 'ascending',
       });
     }
   };
 
   return (
-    <div className="flex overflow-auto border border-gray-300 rounded-md shadow dark:border-gray-700">
+    <div className="flex overflow-auto rounded-md shadow">
       <table className="min-w-full divide-y divide-gray-200 dark:divide-gray-800">
         <thead className="sticky top-0 z-10 text-center bg-gray-50 text-gray-700 dark:text-gray-300 dark:bg-gray-700">
           <tr className="divide-x dark:divide-gray-800">
diff --git a/projects/client/src/pages/shared/dialogs/ChatBoxDialog.tsx b/projects/client/src/pages/shared/dialogs/ChatBoxDialog.tsx
new file mode 100644
index 0000000..848e0d6
--- /dev/null
+++ b/projects/client/src/pages/shared/dialogs/ChatBoxDialog.tsx
@@ -0,0 +1,16 @@
+import { observer } from 'mobx-react';
+import React from 'react';
+import { Clarification } from '../../../core/models';
+import ChatBox from '../chat-box/ChatBox';
+import { DataTableItemForm } from '../data-table/DataTable';
+import { SimpleDialog } from './index';
+
+export const ChatBoxDialog: DataTableItemForm<Clarification> = observer(
+  ({ item, isOpen, onClose, onSubmit }) => {
+    return (
+      <SimpleDialog bodyClassName="h-96" isOpen={isOpen} onClose={onClose} withoutFooter>
+        <ChatBox item={item} isOpen={isOpen} onClose={onClose} onSubmit={onSubmit} />
+      </SimpleDialog>
+    );
+  }
+);
diff --git a/client/src/pages/shared/dialogs/CodeEditorDialog.tsx b/projects/client/src/pages/shared/dialogs/CodeEditorDialog.tsx
similarity index 100%
rename from client/src/pages/shared/dialogs/CodeEditorDialog.tsx
rename to projects/client/src/pages/shared/dialogs/CodeEditorDialog.tsx
diff --git a/client/src/pages/shared/dialogs/DiffViewerDialog.tsx b/projects/client/src/pages/shared/dialogs/DiffViewerDialog.tsx
similarity index 100%
rename from client/src/pages/shared/dialogs/DiffViewerDialog.tsx
rename to projects/client/src/pages/shared/dialogs/DiffViewerDialog.tsx
diff --git a/client/src/pages/shared/dialogs/FormDialog.tsx b/projects/client/src/pages/shared/dialogs/FormDialog.tsx
similarity index 98%
rename from client/src/pages/shared/dialogs/FormDialog.tsx
rename to projects/client/src/pages/shared/dialogs/FormDialog.tsx
index 249c054..8ce07b3 100644
--- a/client/src/pages/shared/dialogs/FormDialog.tsx
+++ b/projects/client/src/pages/shared/dialogs/FormDialog.tsx
@@ -70,7 +70,7 @@ export const FormModal: React.FC<React.PropsWithChildren<Props>> = ({
                   'max-w-6xl': size === '6xl',
                   'max-w-7xl': size === '7xl',
                   'max-w-full': size === 'full',
-                },
+                }
               )}
             >
               <div className="text-xl py-1 font-medium leading-6 text-gray-900 dark:text-gray-100">
@@ -92,7 +92,7 @@ export const FormModal: React.FC<React.PropsWithChildren<Props>> = ({
                       'px-4 py-2 text-sm font-medium text-green-600 bg-green-100 border border-transparent rounded-md disabled:opacity-50 disabled:cursor-default',
                       {
                         'hover:bg-green-200': !submitDisabled,
-                      },
+                      }
                     )}
                     onClick={onSubmit}
                     disabled={submitDisabled}
diff --git a/client/src/pages/shared/dialogs/PdfViewerDialog.tsx b/projects/client/src/pages/shared/dialogs/PdfViewerDialog.tsx
similarity index 100%
rename from client/src/pages/shared/dialogs/PdfViewerDialog.tsx
rename to projects/client/src/pages/shared/dialogs/PdfViewerDialog.tsx
diff --git a/client/src/pages/shared/dialogs/RunContentDialog.tsx b/projects/client/src/pages/shared/dialogs/RunContentDialog.tsx
similarity index 100%
rename from client/src/pages/shared/dialogs/RunContentDialog.tsx
rename to projects/client/src/pages/shared/dialogs/RunContentDialog.tsx
diff --git a/client/src/pages/shared/dialogs/SimpleDialog.tsx b/projects/client/src/pages/shared/dialogs/SimpleDialog.tsx
similarity index 96%
rename from client/src/pages/shared/dialogs/SimpleDialog.tsx
rename to projects/client/src/pages/shared/dialogs/SimpleDialog.tsx
index 68004f8..30b041f 100644
--- a/client/src/pages/shared/dialogs/SimpleDialog.tsx
+++ b/projects/client/src/pages/shared/dialogs/SimpleDialog.tsx
@@ -8,6 +8,7 @@ type Props = {
   isOpen: boolean;
   onClose: () => void;
   withoutFooter?: boolean;
+  bodyClassName?: string;
   size?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl' | '5xl' | '6xl' | '7xl' | 'full';
 };
 
@@ -17,6 +18,7 @@ export const SimpleDialog: React.FC<React.PropsWithChildren<Props>> = ({
   children,
   onClose,
   withoutFooter,
+  bodyClassName,
   size = '5xl',
 }) => {
   return (
@@ -68,7 +70,7 @@ export const SimpleDialog: React.FC<React.PropsWithChildren<Props>> = ({
                   'max-w-6xl': size === '6xl',
                   'max-w-7xl': size === '7xl',
                   'max-w-full': size === 'full',
-                },
+                }
               )}
             >
               {title && (
@@ -76,7 +78,7 @@ export const SimpleDialog: React.FC<React.PropsWithChildren<Props>> = ({
                   {title}
                 </div>
               )}
-              <div>{children}</div>
+              <div className={bodyClassName}>{children}</div>
               {!withoutFooter && (
                 <div className="flex justify-end">
                   <button
diff --git a/client/src/pages/shared/dialogs/TestcaseContentDialog.tsx b/projects/client/src/pages/shared/dialogs/TestcaseContentDialog.tsx
similarity index 100%
rename from client/src/pages/shared/dialogs/TestcaseContentDialog.tsx
rename to projects/client/src/pages/shared/dialogs/TestcaseContentDialog.tsx
diff --git a/client/src/pages/shared/dialogs/index.ts b/projects/client/src/pages/shared/dialogs/index.ts
similarity index 88%
rename from client/src/pages/shared/dialogs/index.ts
rename to projects/client/src/pages/shared/dialogs/index.ts
index 57194ef..e32b383 100644
--- a/client/src/pages/shared/dialogs/index.ts
+++ b/projects/client/src/pages/shared/dialogs/index.ts
@@ -1,3 +1,4 @@
+export * from './ChatBoxDialog';
 export * from './CodeEditorDialog';
 export * from './DiffViewerDialog';
 export * from './FormDialog';
diff --git a/client/src/pages/shared/form-controls/BasicInput.tsx b/projects/client/src/pages/shared/form-controls/BasicInput.tsx
similarity index 99%
rename from client/src/pages/shared/form-controls/BasicInput.tsx
rename to projects/client/src/pages/shared/form-controls/BasicInput.tsx
index 45c3754..82b2b13 100644
--- a/client/src/pages/shared/form-controls/BasicInput.tsx
+++ b/projects/client/src/pages/shared/form-controls/BasicInput.tsx
@@ -99,7 +99,7 @@ const BasicInput: React.FC<FullInputProps> = ({
               {
                 'border-red-600 placeholder-red-900 opacity-70 dark:border-red-500 dark:placeholder-red-500':
                   touched && hasErrors,
-              },
+              }
             )}
             required={required}
             readOnly={readOnly}
@@ -127,7 +127,7 @@ const BasicInput: React.FC<FullInputProps> = ({
               {
                 'border-red-600 placeholder-red-900 opacity-70 dark:border-red-500 dark:placeholder-red-500':
                   touched && hasErrors,
-              },
+              }
             )}
             required={required}
             readOnly={readOnly}
diff --git a/client/src/pages/shared/form-controls/CheckBoxInput.tsx b/projects/client/src/pages/shared/form-controls/CheckBoxInput.tsx
similarity index 100%
rename from client/src/pages/shared/form-controls/CheckBoxInput.tsx
rename to projects/client/src/pages/shared/form-controls/CheckBoxInput.tsx
diff --git a/client/src/pages/shared/form-controls/DateTimeInput.tsx b/projects/client/src/pages/shared/form-controls/DateTimeInput.tsx
similarity index 99%
rename from client/src/pages/shared/form-controls/DateTimeInput.tsx
rename to projects/client/src/pages/shared/form-controls/DateTimeInput.tsx
index dbfe6c7..21ad5d2 100644
--- a/client/src/pages/shared/form-controls/DateTimeInput.tsx
+++ b/projects/client/src/pages/shared/form-controls/DateTimeInput.tsx
@@ -163,7 +163,7 @@ function DateTimeInput<T>({
   const hasErrors = useMemo(
     () => touched && errors?.[field],
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [touched, errors, field, errors?.[field]],
+    [touched, errors, field, errors?.[field]]
   );
 
   const inputRef = useRef<HTMLInputElement>(null);
@@ -418,7 +418,7 @@ function DateTimeInput<T>({
             {
               'border-red-600 placeholder-red-900 opacity-70 dark:border-red-500 dark:placeholder-red-500':
                 hasErrors,
-            },
+            }
           )}
           placeholder={placeHolder ?? label ?? 'Select date'}
         />
@@ -517,7 +517,7 @@ function DateTimeInput<T>({
                                 'hover:bg-blue-100 dark:hover:bg-blue-900':
                                   isDaySelectable && !isEqualSelectedDate,
                                 'text-gray-400 dark:text-gray-500': !isDaySelectable,
-                              },
+                              }
                             )}
                             onClick={isDaySelectable ? setDayNumber(dayNumber) : undefined}
                           >
@@ -540,7 +540,7 @@ function DateTimeInput<T>({
                         index,
                         date.getDate(),
                         date.getHours(),
-                        date.getMinutes(),
+                        date.getMinutes()
                       );
                       const isMonthSelectable =
                         (!minDate || !isLessThanDate(monthDate, new Date(minDate), 'day')) &&
@@ -559,7 +559,7 @@ function DateTimeInput<T>({
                               'hover:bg-blue-100 dark:hover:bg-blue-900':
                                 isMonthSelectable && !isEqualSelectedMonth,
                               'text-gray-400 dark:text-gray-500': !isMonthSelectable,
-                            },
+                            }
                           )}
                           onClick={setMonthView(index)}
                         >
@@ -580,7 +580,7 @@ function DateTimeInput<T>({
                         date.getMonth(),
                         date.getDate(),
                         date.getHours(),
-                        date.getMinutes(),
+                        date.getMinutes()
                       );
                       const isYearSelectable =
                         (!minDate || !isLessThanDate(yearDate, new Date(minDate), 'day')) &&
@@ -599,7 +599,7 @@ function DateTimeInput<T>({
                               'hover:bg-blue-100 dark:hover:bg-blue-900':
                                 isYearSelectable && !isEqualSelectedYear,
                               'text-gray-400 dark:text-gray-500': !isYearSelectable,
-                            },
+                            }
                           )}
                           onClick={setYearView(yearNumber)}
                         >
diff --git a/client/src/pages/shared/form-controls/DropDownInput.tsx b/projects/client/src/pages/shared/form-controls/DropDownInput.tsx
similarity index 94%
rename from client/src/pages/shared/form-controls/DropDownInput.tsx
rename to projects/client/src/pages/shared/form-controls/DropDownInput.tsx
index fe51ee9..017f34b 100644
--- a/client/src/pages/shared/form-controls/DropDownInput.tsx
+++ b/projects/client/src/pages/shared/form-controls/DropDownInput.tsx
@@ -15,6 +15,7 @@ type Props<T, R> = EntityFieldInputProps<T, R> & {
   search?: boolean;
   multiple?: boolean;
   allowAdditions?: boolean;
+  onUnselect?: (item: R) => void;
 } & BasicInputProps;
 
 type Option<T> = { key: string; text: string; value: T };
@@ -39,6 +40,7 @@ function DropDownInput<T, R = any>({
   errors,
   setErrors,
   onChange,
+  onUnselect,
 }: Props<T, R>): JSX.Element {
   const [optionsState, setOptions] = useState<Option<R>[]>([]);
   const [selectedValues, setSelectedValues] = useState<{ key: string; text: string }[]>([]);
@@ -51,7 +53,7 @@ function DropDownInput<T, R = any>({
   const hasErrors = useMemo(
     () => touched && errors?.[field],
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [touched, errors, field, errors?.[field]],
+    [touched, errors, field, errors?.[field]]
   );
 
   useEffect(() => {
@@ -67,8 +69,8 @@ function DropDownInput<T, R = any>({
               key: value,
               text: value,
               value: value,
-            },
-      ),
+            }
+      )
     );
   }, [entity, field, options, optionsIdField, optionsTextField, optionsValueField]);
 
@@ -89,7 +91,7 @@ function DropDownInput<T, R = any>({
                     text:
                       optionsState.find((option) => option.key === value)?.text ??
                       value[optionsTextField ?? 'id'],
-                  },
+                  }
             )
           : typeof entity?.[field] === 'object'
           ? [
@@ -97,7 +99,7 @@ function DropDownInput<T, R = any>({
                 key: (entity[field] as any)[optionsIdField ?? 'id'],
                 text:
                   optionsState.find(
-                    (option) => option.key === (entity[field] as any)[optionsIdField ?? 'id'],
+                    (option) => option.key === (entity[field] as any)[optionsIdField ?? 'id']
                   )?.text ?? (entity[field] as any)[optionsTextField ?? 'id'],
               },
             ]
@@ -110,9 +112,9 @@ function DropDownInput<T, R = any>({
                   entity[field],
               },
             ]
-          : [],
+          : []
       ),
-    [entity, field, optionsState, multiple, optionsIdField, optionsTextField],
+    [entity, field, optionsState, multiple, optionsIdField, optionsTextField]
   );
 
   useEffect(() => {
@@ -124,12 +126,12 @@ function DropDownInput<T, R = any>({
       multiple
         ? !!((entity[field] as any) ?? []).find(
             (value: any) =>
-              (typeof value === 'object' ? value[optionsIdField ?? 'id'] : value) === key,
+              (typeof value === 'object' ? value[optionsIdField ?? 'id'] : value) === key
           )
         : typeof entity?.[field] === 'object'
         ? (entity[field] as any)[optionsIdField ?? 'id'] === key
         : (entity[field] as any) === key,
-    [entity, field, multiple, optionsIdField],
+    [entity, field, multiple, optionsIdField]
   );
 
   const refreshFilteredOptions = useCallback(
@@ -137,10 +139,10 @@ function DropDownInput<T, R = any>({
       setFilteredOptions(
         optionsState.filter(
           ({ key, text }) =>
-            !search || (!isOptionSelected(key) && text.includes(searchValue.trim())),
-        ),
+            !search || (!isOptionSelected(key) && text.includes(searchValue.trim()))
+        )
       ),
-    [isOptionSelected, optionsState, search, searchValue],
+    [isOptionSelected, optionsState, search, searchValue]
   );
 
   useEffect(() => {
@@ -176,14 +178,15 @@ function DropDownInput<T, R = any>({
   const unselectValue = (key: string) => (event?: React.MouseEvent<HTMLOrSVGElement>) => {
     event?.stopPropagation();
 
+    const unselectedItem = ((entity[field] as any) ?? []).find(
+      (value: any) => (typeof value === 'object' ? value[optionsIdField ?? 'id'] : value) === key
+    );
     entity[field] = ((entity[field] as any) ?? []).filter(
-      (value: any) => (typeof value === 'object' ? value[optionsIdField ?? 'id'] : value) !== key,
+      (value: any) => (typeof value === 'object' ? value[optionsIdField ?? 'id'] : value) !== key
     );
 
     refreshSelectedValues();
     refreshFilteredOptions();
-    inputRef.current && (inputRef.current.value = '');
-    setSearchValue('');
 
     if (isEmpty(entity[field])) {
       required && setErrors?.({ ...errors, [field]: true });
@@ -191,6 +194,7 @@ function DropDownInput<T, R = any>({
       setErrors?.({ ...errors, [field]: false });
     }
     onChange?.(entity[field] as any);
+    onUnselect?.(unselectedItem);
   };
 
   const addOptionAndSelect = (event: React.KeyboardEvent<HTMLInputElement>) => {
@@ -254,7 +258,7 @@ function DropDownInput<T, R = any>({
                 'border-red-600 placeholder-red-900 opacity-70 dark:border-red-500 dark:placeholder-red-500':
                   hasErrors,
                 'mt-1': !!label,
-              },
+              }
             )}
             ref={triggerRef}
           >
@@ -327,7 +331,7 @@ function DropDownInput<T, R = any>({
                       {
                         'bg-gray-200 dark:bg-gray-500': optionSelected,
                         'hover:bg-gray-100 dark:hover:bg-gray-600': !optionSelected,
-                      },
+                      }
                     )}
                     value={key}
                   >
diff --git a/client/src/pages/shared/form-controls/FileInput.tsx b/projects/client/src/pages/shared/form-controls/FileInput.tsx
similarity index 100%
rename from client/src/pages/shared/form-controls/FileInput.tsx
rename to projects/client/src/pages/shared/form-controls/FileInput.tsx
diff --git a/client/src/pages/shared/form-controls/Label.tsx b/projects/client/src/pages/shared/form-controls/Label.tsx
similarity index 98%
rename from client/src/pages/shared/form-controls/Label.tsx
rename to projects/client/src/pages/shared/form-controls/Label.tsx
index c55c347..899000c 100644
--- a/client/src/pages/shared/form-controls/Label.tsx
+++ b/projects/client/src/pages/shared/form-controls/Label.tsx
@@ -17,7 +17,7 @@ const Label: React.FC<Props> = ({ label, description, required, hasErrors }) =>
         'flex items-center gap-1 font-medium text-gray-700 dark:text-gray-100',
         {
           'text-red-900 dark:text-red-500': hasErrors,
-        },
+        }
       )}
     >
       <span>
diff --git a/client/src/pages/shared/form-controls/NumberInput.tsx b/projects/client/src/pages/shared/form-controls/NumberInput.tsx
similarity index 100%
rename from client/src/pages/shared/form-controls/NumberInput.tsx
rename to projects/client/src/pages/shared/form-controls/NumberInput.tsx
diff --git a/client/src/pages/shared/form-controls/TextInput.tsx b/projects/client/src/pages/shared/form-controls/TextInput.tsx
similarity index 100%
rename from client/src/pages/shared/form-controls/TextInput.tsx
rename to projects/client/src/pages/shared/form-controls/TextInput.tsx
diff --git a/client/src/pages/shared/form-controls/TextareaInput.tsx b/projects/client/src/pages/shared/form-controls/TextareaInput.tsx
similarity index 100%
rename from client/src/pages/shared/form-controls/TextareaInput.tsx
rename to projects/client/src/pages/shared/form-controls/TextareaInput.tsx
diff --git a/client/src/pages/shared/form-controls/types.ts b/projects/client/src/pages/shared/form-controls/types.ts
similarity index 100%
rename from client/src/pages/shared/form-controls/types.ts
rename to projects/client/src/pages/shared/form-controls/types.ts
diff --git a/client/src/pages/shared/tooltip/Tooltip.tsx b/projects/client/src/pages/shared/tooltip/Tooltip.tsx
similarity index 100%
rename from client/src/pages/shared/tooltip/Tooltip.tsx
rename to projects/client/src/pages/shared/tooltip/Tooltip.tsx
diff --git a/client/src/pages/shared/tooltip/TooltipContainer.tsx b/projects/client/src/pages/shared/tooltip/TooltipContainer.tsx
similarity index 98%
rename from client/src/pages/shared/tooltip/TooltipContainer.tsx
rename to projects/client/src/pages/shared/tooltip/TooltipContainer.tsx
index a5a673b..8932d1f 100644
--- a/client/src/pages/shared/tooltip/TooltipContainer.tsx
+++ b/projects/client/src/pages/shared/tooltip/TooltipContainer.tsx
@@ -28,7 +28,7 @@ const TooltipContainer: React.FC = observer(() => {
                 'transform -translate-x-1/2 left-1/2 top-full': tooltip.position === 'bottom',
                 'transform -translate-y-1/2 top-1/2 left-full': tooltip.position === 'right',
               },
-              tooltip.className,
+              tooltip.className
             )}
           >
             <div
diff --git a/client/src/pages/team/TeamLayout.tsx b/projects/client/src/pages/team/TeamLayout.tsx
similarity index 100%
rename from client/src/pages/team/TeamLayout.tsx
rename to projects/client/src/pages/team/TeamLayout.tsx
diff --git a/client/src/pages/team/TeamNavbar.tsx b/projects/client/src/pages/team/TeamNavbar.tsx
similarity index 97%
rename from client/src/pages/team/TeamNavbar.tsx
rename to projects/client/src/pages/team/TeamNavbar.tsx
index 15e374c..9325413 100644
--- a/client/src/pages/team/TeamNavbar.tsx
+++ b/projects/client/src/pages/team/TeamNavbar.tsx
@@ -23,6 +23,8 @@ const TeamNavbar: React.FC = observer(() => {
     teamStore: { sendSubmission },
   } = rootStore;
 
+  history.listen(() => setCurrentTab(location.pathname.replace(/\/?/g, '')));
+
   const onLinkClick = (tab: Tabs) => {
     setCurrentTab(tab);
     history.push(`/${tab}`);
@@ -102,7 +104,7 @@ const TeamNavbar: React.FC = observer(() => {
         item={{} as Submission}
         onClose={() => setSubmitFormOpen(false)}
         onSubmit={async (submission) => {
-          await sendSubmission(currentContest!.id, profile!.team.id, submission);
+          await sendSubmission(currentContest!.id, profile!.team!.id, submission);
           setSubmitFormOpen(false);
         }}
       />
diff --git a/projects/client/src/pages/team/views/ClarificationsList.tsx b/projects/client/src/pages/team/views/ClarificationsList.tsx
new file mode 100644
index 0000000..ec92b26
--- /dev/null
+++ b/projects/client/src/pages/team/views/ClarificationsList.tsx
@@ -0,0 +1,69 @@
+import { observable } from 'mobx';
+import { observer } from 'mobx-react';
+import React from 'react';
+import { countUnseenMessages, generalComparator } from '../../../core/helpers';
+import { Clarification } from '../../../core/models';
+import { rootStore } from '../../../core/stores/RootStore';
+import DataTable, { ListPageTableColumn } from '../../shared/data-table/DataTable';
+import { ChatBoxDialog } from '../../shared/dialogs';
+
+const ClarificationsList: React.FC = observer(() => {
+  const {
+    profile,
+    updatesCount: { clarifications },
+    publicStore: { currentContest },
+    clarificationsStore: { fetchAllForTeam },
+  } = rootStore;
+
+  const columns: ListPageTableColumn<Clarification>[] = [
+    {
+      header: 'Subject',
+      field: 'problem',
+      render: (clarification) => {
+        const unseenMessagesCount = countUnseenMessages(clarification, profile!);
+        return (
+          <div className="flex justify-between w-full">
+            {clarification.general || !clarification.problem
+              ? 'General'
+              : `Problem ${
+                  currentContest?.problems?.find(
+                    (problem) => problem.problem.id === clarification.problem?.id
+                  )?.shortName ?? '-'
+                }`}
+            {unseenMessagesCount > 0 && (
+              <div className="text-sm text-white px-2 py-0.5 rounded-md bg-green-500 float-right">
+                {unseenMessagesCount}
+              </div>
+            )}
+          </div>
+        );
+      },
+    },
+  ];
+
+  const fetchAll = () =>
+    currentContest && profile?.team
+      ? fetchAllForTeam(currentContest.id, profile.team.id).then((result) =>
+          result.sort(generalComparator(true))
+        )
+      : Promise.resolve([]);
+
+  return (
+    <DataTable<Clarification>
+      header="Clarifications"
+      dataFetcher={fetchAll}
+      dataDependencies={[currentContest, clarifications]}
+      fetchOnClose
+      columns={columns}
+      canDelete={() => false}
+      ItemForm={ChatBoxDialog}
+      formItemInitValue={observable({
+        general: true,
+        team: profile?.team,
+        messages: [],
+      })}
+    />
+  );
+});
+
+export default ClarificationsList;
diff --git a/client/src/pages/team/views/HomeView.tsx b/projects/client/src/pages/team/views/HomeView.tsx
similarity index 66%
rename from client/src/pages/team/views/HomeView.tsx
rename to projects/client/src/pages/team/views/HomeView.tsx
index 520b9ac..a5c11b7 100644
--- a/client/src/pages/team/views/HomeView.tsx
+++ b/projects/client/src/pages/team/views/HomeView.tsx
@@ -1,13 +1,19 @@
+import { observer } from 'mobx-react';
 import React from 'react';
+import { rootStore } from '../../../core/stores/RootStore';
 import ProblemSet from '../../shared/ProblemSet';
 import Scoreboard from '../../shared/Scoreboard';
 import ClarificationsList from './ClarificationsList';
 import SubmissionsList from './SubmissionsList';
 
-const HomeView: React.FC = () => {
+const HomeView: React.FC = observer(() => {
+  const {
+    publicStore: { currentContest },
+  } = rootStore;
+
   return (
     <div className="flex flex-col items-center gap-4">
-      <Scoreboard className="pt-12" compact />
+      <Scoreboard contest={currentContest!} className="pt-12" compact />
       <div className="xl:container grid grid-cols-2 gap-4 px-4">
         <div className="flex flex-col gap-4">
           <ProblemSet listMode />
@@ -17,6 +23,6 @@ const HomeView: React.FC = () => {
       </div>
     </div>
   );
-};
+});
 
 export default HomeView;
diff --git a/client/src/pages/team/views/SubmissionsList.tsx b/projects/client/src/pages/team/views/SubmissionsList.tsx
similarity index 99%
rename from client/src/pages/team/views/SubmissionsList.tsx
rename to projects/client/src/pages/team/views/SubmissionsList.tsx
index 05d27dc..7dff222 100644
--- a/client/src/pages/team/views/SubmissionsList.tsx
+++ b/projects/client/src/pages/team/views/SubmissionsList.tsx
@@ -23,7 +23,7 @@ const SubmissionsList: React.FC = observer(() => {
         formatRestTime(
           (new Date(submission.submitTime).getTime() -
             new Date(currentContest?.startTime ?? 0).getTime()) /
-            1000,
+            1000
         ),
     },
     {
diff --git a/client/src/pages/team/views/SubmitForm.tsx b/projects/client/src/pages/team/views/SubmitForm.tsx
similarity index 99%
rename from client/src/pages/team/views/SubmitForm.tsx
rename to projects/client/src/pages/team/views/SubmitForm.tsx
index c0b8f5e..20dabec 100644
--- a/client/src/pages/team/views/SubmitForm.tsx
+++ b/projects/client/src/pages/team/views/SubmitForm.tsx
@@ -80,7 +80,7 @@ const SubmitForm: DataTableItemForm<Submission> = observer(
         />
       </FormModal>
     );
-  },
+  }
 );
 
 export default SubmitForm;
diff --git a/client/src/react-app-env.d.ts b/projects/client/src/react-app-env.d.ts
similarity index 100%
rename from client/src/react-app-env.d.ts
rename to projects/client/src/react-app-env.d.ts
diff --git a/client/src/setupTests.ts b/projects/client/src/setupTests.ts
similarity index 100%
rename from client/src/setupTests.ts
rename to projects/client/src/setupTests.ts
diff --git a/client/tailwind.config.js b/projects/client/tailwind.config.js
similarity index 100%
rename from client/tailwind.config.js
rename to projects/client/tailwind.config.js
diff --git a/client/tsconfig.json b/projects/client/tsconfig.json
similarity index 100%
rename from client/tsconfig.json
rename to projects/client/tsconfig.json
diff --git a/client/yarn.lock b/projects/client/yarn.lock
similarity index 100%
rename from client/yarn.lock
rename to projects/client/yarn.lock
diff --git a/judge/.env b/projects/judge/.env
similarity index 100%
rename from judge/.env
rename to projects/judge/.env
diff --git a/judge/.eslintrc.js b/projects/judge/.eslintrc.js
similarity index 100%
rename from judge/.eslintrc.js
rename to projects/judge/.eslintrc.js
diff --git a/judge/.gitignore b/projects/judge/.gitignore
similarity index 100%
rename from judge/.gitignore
rename to projects/judge/.gitignore
diff --git a/judge/README.md b/projects/judge/README.md
similarity index 100%
rename from judge/README.md
rename to projects/judge/README.md
diff --git a/judge/assets/guard.cpp b/projects/judge/assets/guard.cpp
similarity index 100%
rename from judge/assets/guard.cpp
rename to projects/judge/assets/guard.cpp
diff --git a/judge/assets/testlib.h b/projects/judge/assets/testlib.h
similarity index 100%
rename from judge/assets/testlib.h
rename to projects/judge/assets/testlib.h
diff --git a/judge/nest-cli.json b/projects/judge/nest-cli.json
similarity index 100%
rename from judge/nest-cli.json
rename to projects/judge/nest-cli.json
diff --git a/judge/nodemon.json b/projects/judge/nodemon.json
similarity index 100%
rename from judge/nodemon.json
rename to projects/judge/nodemon.json
diff --git a/judge/package.json b/projects/judge/package.json
similarity index 93%
rename from judge/package.json
rename to projects/judge/package.json
index 335ec50..61199ec 100644
--- a/judge/package.json
+++ b/projects/judge/package.json
@@ -9,12 +9,11 @@
     "prebuild": "rimraf dist",
     "build": "nest build",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "prettier": "prettier --check src",
     "start": "nest start",
     "start:dev": "nest start --watch",
     "start:debug": "nest start --debug --watch",
     "start:prod": "node dist/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "lint": "eslint \"{src,test}/**/*.ts\"",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
@@ -57,8 +56,6 @@
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-prettier": "^3.4.1",
     "jest": "^27.2.4",
-    "prettier": "^2.4.1",
-    "prettier-plugin-organize-imports": "^2.3.4",
     "supertest": "^6.1.6",
     "ts-jest": "^27.0.5",
     "ts-loader": "^9.2.6",
diff --git a/judge/src/app.module.ts b/projects/judge/src/app.module.ts
similarity index 100%
rename from judge/src/app.module.ts
rename to projects/judge/src/app.module.ts
diff --git a/judge/src/config.ts b/projects/judge/src/config.ts
similarity index 100%
rename from judge/src/config.ts
rename to projects/judge/src/config.ts
diff --git a/judge/src/helpers/index.ts b/projects/judge/src/helpers/index.ts
similarity index 100%
rename from judge/src/helpers/index.ts
rename to projects/judge/src/helpers/index.ts
diff --git a/judge/src/helpers/spinner.ts b/projects/judge/src/helpers/spinner.ts
similarity index 100%
rename from judge/src/helpers/spinner.ts
rename to projects/judge/src/helpers/spinner.ts
diff --git a/judge/src/helpers/submission-helper.ts b/projects/judge/src/helpers/submission-helper.ts
similarity index 100%
rename from judge/src/helpers/submission-helper.ts
rename to projects/judge/src/helpers/submission-helper.ts
diff --git a/judge/src/http/http.client.ts b/projects/judge/src/http/http.client.ts
similarity index 100%
rename from judge/src/http/http.client.ts
rename to projects/judge/src/http/http.client.ts
diff --git a/judge/src/http/index.ts b/projects/judge/src/http/index.ts
similarity index 100%
rename from judge/src/http/index.ts
rename to projects/judge/src/http/index.ts
diff --git a/judge/src/judging-steps/compiler.ts b/projects/judge/src/judging-steps/compiler.ts
similarity index 94%
rename from judge/src/judging-steps/compiler.ts
rename to projects/judge/src/judging-steps/compiler.ts
index 0787f37..41f6053 100644
--- a/judge/src/judging-steps/compiler.ts
+++ b/projects/judge/src/judging-steps/compiler.ts
@@ -18,7 +18,7 @@ export class Compiler {
     private readonly dockerService: DockerService,
     private readonly socketService: SocketService,
     private readonly systemService: SystemService,
-    private readonly submissionHelper: SubmissionHelper,
+    private readonly submissionHelper: SubmissionHelper
   ) {
     this.logger = new JudgeLogger(Compiler.name, getOnLog(this.socketService));
   }
@@ -73,14 +73,14 @@ export class Compiler {
     // Executing the compile command inside the submission compile container
     const compileSubmissionResult = await this.dockerService.execCmdInDocker(
       submissionCompilerContainer,
-      this.submissionHelper.compileCmd(),
+      this.submissionHelper.compileCmd()
     );
 
     // Compile the guard code inside the language container to assure the compatibility with the linux kernel
     await this.dockerService.execCmdInDocker(
       submissionCompilerContainer,
       ['g++', '--std=c++11', '-pthread', '-o', 'guard', 'guard.cpp'],
-      this.submissionHelper.assetsDir(),
+      this.submissionHelper.assetsDir()
     );
 
     // Report the result of the submission file compilation
@@ -97,7 +97,7 @@ export class Compiler {
     // Check if we already built the check script or not to prevent the double work
     const checkerBinPath = this.submissionHelper.executableBinPath(
       checkScript.id,
-      checkScript.file,
+      checkScript.file
     );
     if (existsSync(checkerBinPath)) return undefined;
 
@@ -117,19 +117,19 @@ export class Compiler {
     // Make the checker build script executable
     await fs.chmod(
       this.submissionHelper.executableFilePath(checkScript.id, checkScript.buildScript),
-      '0775',
+      '0775'
     );
 
     // Copy the testlib.h to the compiling directory to support the Codeforces checkers
     await fs.copyFile(
       this.submissionHelper.testLibPath,
-      join(this.submissionHelper.executableFileDir(checkScript.id, checkScript.file), 'testlib.h'),
+      join(this.submissionHelper.executableFileDir(checkScript.id, checkScript.file), 'testlib.h')
     );
 
     // Executing the compile command inside the checker compile container
     const compileCheckerResult = await this.dockerService.execCmdInDocker(
       checkerContainer,
-      this.submissionHelper.checkerCompileCmd(),
+      this.submissionHelper.checkerCompileCmd()
     );
 
     await this.dockerService.pruneContainer(checkerContainer);
@@ -141,7 +141,7 @@ export class Compiler {
 
   private async setJudgingCompileOutput(
     judging: Judging,
-    compileSubmissionResult: ExecResult,
+    compileSubmissionResult: ExecResult
   ): Promise<void> {
     const payload = Buffer.from(compileSubmissionResult.stdout.trim()).toString('base64');
     judging.compileOutput = {
diff --git a/judge/src/judging-steps/executor.ts b/projects/judge/src/judging-steps/executor.ts
similarity index 96%
rename from judge/src/judging-steps/executor.ts
rename to projects/judge/src/judging-steps/executor.ts
index c499c7d..b9ae0c0 100644
--- a/judge/src/judging-steps/executor.ts
+++ b/projects/judge/src/judging-steps/executor.ts
@@ -19,7 +19,7 @@ export class Executor {
     private readonly dockerService: DockerService,
     private readonly socketService: SocketService,
     private readonly systemService: SystemService,
-    private readonly submissionHelper: SubmissionHelper,
+    private readonly submissionHelper: SubmissionHelper
   ) {
     this.logger = new JudgeLogger(Executor.name, getOnLog(this.socketService));
   }
@@ -57,7 +57,7 @@ export class Executor {
       // Executing the run command inside the runner container
       await this.dockerService.execCmdInDocker(
         runnerContainer,
-        this.submissionHelper.runCmd(testcase),
+        this.submissionHelper.runCmd(testcase)
       );
 
       // Read the guard result that contains the used time/memory and the exit code
@@ -82,7 +82,7 @@ export class Executor {
       // Executing the checking command inside the checker container
       const checkingResult = await this.dockerService.execCmdInDocker(
         checkerContainer,
-        this.submissionHelper.checkerRunCmd(testcase),
+        this.submissionHelper.checkerRunCmd(testcase)
       );
 
       spinner.stop();
@@ -107,9 +107,9 @@ export class Executor {
         ['test.out', 'test.err', 'checker.out', 'guard.json'].map((file) =>
           fs.rename(
             this.submissionHelper.extraFilesPath(file),
-            join(this.submissionHelper.runTestcaseDir(testcase.rank), file),
-          ),
-        ),
+            join(this.submissionHelper.runTestcaseDir(testcase.rank), file)
+          )
+        )
       );
     }
 
@@ -125,7 +125,7 @@ export class Executor {
     judging: Judging,
     testcase: Testcase,
     guardOutput: GuardOutput,
-    result: JudgingRunResult,
+    result: JudgingRunResult
   ): Promise<void> {
     const judgingRun: Partial<JudgingRun> = {
       result: result,
diff --git a/judge/src/judging-steps/index.ts b/projects/judge/src/judging-steps/index.ts
similarity index 100%
rename from judge/src/judging-steps/index.ts
rename to projects/judge/src/judging-steps/index.ts
diff --git a/judge/src/judging-steps/initializer.ts b/projects/judge/src/judging-steps/initializer.ts
similarity index 98%
rename from judge/src/judging-steps/initializer.ts
rename to projects/judge/src/judging-steps/initializer.ts
index a7260b7..455c4e2 100644
--- a/judge/src/judging-steps/initializer.ts
+++ b/projects/judge/src/judging-steps/initializer.ts
@@ -22,7 +22,7 @@ export class Initializer {
     private readonly dockerService: DockerService,
     private readonly socketService: SocketService,
     private readonly systemService: SystemService,
-    private readonly submissionHelper: SubmissionHelper,
+    private readonly submissionHelper: SubmissionHelper
   ) {
     this.logger = new JudgeLogger(Initializer.name, getOnLog(this.socketService));
   }
@@ -56,7 +56,7 @@ export class Initializer {
         if (!existsSync(filePath)) {
           testcase[type].content = await this.systemService.getTestcaseFileContent(
             testcase.id,
-            type,
+            type
           );
           writeFileSync(filePath, testcase[type].content.payload, 'base64');
           this.logger.debug(`Testcase file ${testcase[type].name} written!`);
diff --git a/judge/src/logger/index.ts b/projects/judge/src/logger/index.ts
similarity index 100%
rename from judge/src/logger/index.ts
rename to projects/judge/src/logger/index.ts
diff --git a/judge/src/logger/judge.logger.ts b/projects/judge/src/logger/judge.logger.ts
similarity index 97%
rename from judge/src/logger/judge.logger.ts
rename to projects/judge/src/logger/judge.logger.ts
index 8649718..e372af0 100644
--- a/judge/src/logger/judge.logger.ts
+++ b/projects/judge/src/logger/judge.logger.ts
@@ -42,7 +42,7 @@ export class JudgeLogger extends Logger {
     level: LogLevel,
     context = '',
     returnToLine = true,
-    writeStreamType: 'stdout' | 'stderr' = 'stdout',
+    writeStreamType: 'stdout' | 'stderr' = 'stdout'
   ) {
     if (logLevelRanks[level] > (logLevelRanks[config.logLevel] ?? 2)) return;
 
diff --git a/judge/src/main.ts b/projects/judge/src/main.ts
similarity index 100%
rename from judge/src/main.ts
rename to projects/judge/src/main.ts
diff --git a/judge/src/models/contest-problem.model.ts b/projects/judge/src/models/contest-problem.model.ts
similarity index 100%
rename from judge/src/models/contest-problem.model.ts
rename to projects/judge/src/models/contest-problem.model.ts
diff --git a/judge/src/models/contest.model.ts b/projects/judge/src/models/contest.model.ts
similarity index 100%
rename from judge/src/models/contest.model.ts
rename to projects/judge/src/models/contest.model.ts
diff --git a/judge/src/models/executable.model.ts b/projects/judge/src/models/executable.model.ts
similarity index 100%
rename from judge/src/models/executable.model.ts
rename to projects/judge/src/models/executable.model.ts
diff --git a/judge/src/models/file-content.model.ts b/projects/judge/src/models/file-content.model.ts
similarity index 100%
rename from judge/src/models/file-content.model.ts
rename to projects/judge/src/models/file-content.model.ts
diff --git a/judge/src/models/file.model.ts b/projects/judge/src/models/file.model.ts
similarity index 100%
rename from judge/src/models/file.model.ts
rename to projects/judge/src/models/file.model.ts
diff --git a/judge/src/models/index.ts b/projects/judge/src/models/index.ts
similarity index 100%
rename from judge/src/models/index.ts
rename to projects/judge/src/models/index.ts
diff --git a/judge/src/models/judge-host.model.ts b/projects/judge/src/models/judge-host.model.ts
similarity index 100%
rename from judge/src/models/judge-host.model.ts
rename to projects/judge/src/models/judge-host.model.ts
diff --git a/judge/src/models/judging-run.model.ts b/projects/judge/src/models/judging-run.model.ts
similarity index 100%
rename from judge/src/models/judging-run.model.ts
rename to projects/judge/src/models/judging-run.model.ts
diff --git a/judge/src/models/judging.model.ts b/projects/judge/src/models/judging.model.ts
similarity index 100%
rename from judge/src/models/judging.model.ts
rename to projects/judge/src/models/judging.model.ts
diff --git a/judge/src/models/language.model.ts b/projects/judge/src/models/language.model.ts
similarity index 100%
rename from judge/src/models/language.model.ts
rename to projects/judge/src/models/language.model.ts
diff --git a/judge/src/models/problem.model.ts b/projects/judge/src/models/problem.model.ts
similarity index 100%
rename from judge/src/models/problem.model.ts
rename to projects/judge/src/models/problem.model.ts
diff --git a/judge/src/models/role.model.ts b/projects/judge/src/models/role.model.ts
similarity index 100%
rename from judge/src/models/role.model.ts
rename to projects/judge/src/models/role.model.ts
diff --git a/judge/src/models/submission.model.ts b/projects/judge/src/models/submission.model.ts
similarity index 100%
rename from judge/src/models/submission.model.ts
rename to projects/judge/src/models/submission.model.ts
diff --git a/judge/src/models/team-category.model.ts b/projects/judge/src/models/team-category.model.ts
similarity index 100%
rename from judge/src/models/team-category.model.ts
rename to projects/judge/src/models/team-category.model.ts
diff --git a/judge/src/models/team.model.ts b/projects/judge/src/models/team.model.ts
similarity index 100%
rename from judge/src/models/team.model.ts
rename to projects/judge/src/models/team.model.ts
diff --git a/judge/src/models/testcase.model.ts b/projects/judge/src/models/testcase.model.ts
similarity index 100%
rename from judge/src/models/testcase.model.ts
rename to projects/judge/src/models/testcase.model.ts
diff --git a/client/src/core/models/user.model.ts b/projects/judge/src/models/user.model.ts
similarity index 100%
rename from client/src/core/models/user.model.ts
rename to projects/judge/src/models/user.model.ts
diff --git a/judge/src/services/docker.service.ts b/projects/judge/src/services/docker.service.ts
similarity index 96%
rename from judge/src/services/docker.service.ts
rename to projects/judge/src/services/docker.service.ts
index 0575a29..7a0bc5e 100644
--- a/judge/src/services/docker.service.ts
+++ b/projects/judge/src/services/docker.service.ts
@@ -18,7 +18,7 @@ export class DockerService {
 
   constructor(
     private readonly socketService: SocketService,
-    private readonly submissionHelper: SubmissionHelper,
+    private readonly submissionHelper: SubmissionHelper
   ) {
     this.logger = new JudgeLogger(DockerService.name, getOnLog(this.socketService));
     this.connection = new Docker({ socketPath: '/var/run/docker.sock' });
@@ -37,7 +37,7 @@ export class DockerService {
           this.connection.modem.followProgress(
             stream,
             (error: Error | null) => (error ? reject(error) : resolve()),
-            ({ status }: { status: string }) => this.logger.debug(`${tag}: ${status}`),
+            ({ status }: { status: string }) => this.logger.debug(`${tag}: ${status}`)
           );
         });
       });
@@ -81,7 +81,7 @@ export class DockerService {
         resolve({
           ...result,
           exitCode: (await exec.inspect()).ExitCode ?? 1,
-        }),
+        })
       );
     });
   }
diff --git a/judge/src/services/index.ts b/projects/judge/src/services/index.ts
similarity index 100%
rename from judge/src/services/index.ts
rename to projects/judge/src/services/index.ts
diff --git a/judge/src/services/judging.service.ts b/projects/judge/src/services/judging.service.ts
similarity index 97%
rename from judge/src/services/judging.service.ts
rename to projects/judge/src/services/judging.service.ts
index 7c6d556..f51e3d2 100644
--- a/judge/src/services/judging.service.ts
+++ b/projects/judge/src/services/judging.service.ts
@@ -21,7 +21,7 @@ export class JudgingService {
     @Inject(forwardRef(() => Compiler))
     private readonly compiler: Compiler,
     @Inject(forwardRef(() => Executor))
-    private readonly executor: Executor,
+    private readonly executor: Executor
   ) {
     this.logger = new JudgeLogger(JudgingService.name, getOnLog(this.socketService));
     this.run();
@@ -46,7 +46,7 @@ export class JudgingService {
   async runJudging(judging: Judging): Promise<void> {
     try {
       this.logger.log(
-        `Judging '${judging.id}' for problem '${judging.submission.problem.name}' and language '${judging.submission.language.name}' received!`,
+        `Judging '${judging.id}' for problem '${judging.submission.problem.name}' and language '${judging.submission.language.name}' received!`
       );
       this.submissionHelper.setSubmission(judging.submission);
       await this.initializer.run(judging);
diff --git a/judge/src/services/socket.service.ts b/projects/judge/src/services/socket.service.ts
similarity index 100%
rename from judge/src/services/socket.service.ts
rename to projects/judge/src/services/socket.service.ts
diff --git a/judge/src/services/system.service.ts b/projects/judge/src/services/system.service.ts
similarity index 97%
rename from judge/src/services/system.service.ts
rename to projects/judge/src/services/system.service.ts
index 40ea6be..983eb1e 100644
--- a/judge/src/services/system.service.ts
+++ b/projects/judge/src/services/system.service.ts
@@ -23,14 +23,14 @@ export class SystemService {
   updateJudging(judging: Judging): Promise<void> {
     return http.put(
       `api/judge-hosts/${judging.judgeHost.hostname}/update-judging/${judging.id}`,
-      judging,
+      judging
     );
   }
 
   addJudgingRun(judging: Judging, judgingRun: Partial<JudgingRun>): Promise<void> {
     return http.post(
       `api/judge-hosts/${judging.judgeHost.hostname}/add-judging-run/${judging.id}`,
-      judgingRun,
+      judgingRun
     );
   }
 }
diff --git a/server/test/app.e2e-spec.ts b/projects/judge/test/app.e2e-spec.ts
similarity index 83%
rename from server/test/app.e2e-spec.ts
rename to projects/judge/test/app.e2e-spec.ts
index 50cda62..5f1aedc 100644
--- a/server/test/app.e2e-spec.ts
+++ b/projects/judge/test/app.e2e-spec.ts
@@ -1,5 +1,5 @@
-import { Test, TestingModule } from '@nestjs/testing';
 import { INestApplication } from '@nestjs/common';
+import { Test, TestingModule } from '@nestjs/testing';
 import * as request from 'supertest';
 import { AppModule } from './../src/app.module';
 
@@ -16,9 +16,6 @@ describe('AppController (e2e)', () => {
   });
 
   it('/ (GET)', () => {
-    return request(app.getHttpServer())
-      .get('/')
-      .expect(200)
-      .expect('Hello World!');
+    return request(app.getHttpServer()).get('/').expect(200).expect('Hello World!');
   });
 });
diff --git a/judge/test/jest-e2e.json b/projects/judge/test/jest-e2e.json
similarity index 100%
rename from judge/test/jest-e2e.json
rename to projects/judge/test/jest-e2e.json
diff --git a/judge/tsconfig.build.json b/projects/judge/tsconfig.build.json
similarity index 100%
rename from judge/tsconfig.build.json
rename to projects/judge/tsconfig.build.json
diff --git a/judge/tsconfig.json b/projects/judge/tsconfig.json
similarity index 100%
rename from judge/tsconfig.json
rename to projects/judge/tsconfig.json
diff --git a/judge/yarn.lock b/projects/judge/yarn.lock
similarity index 99%
rename from judge/yarn.lock
rename to projects/judge/yarn.lock
index dd535fe..f9c6b5d 100644
--- a/judge/yarn.lock
+++ b/projects/judge/yarn.lock
@@ -4165,16 +4165,6 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier-plugin-organize-imports@^2.3.4:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-2.3.4.tgz#65473861ae5ab7960439fff270a2258558fbe9ba"
-  integrity sha512-R8o23sf5iVL/U71h9SFUdhdOEPsi3nm42FD/oDYIZ2PQa4TNWWuWecxln6jlIQzpZTDMUeO1NicJP6lLn2TtRw==
-
-prettier@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
-  integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==
-
 pretty-format@^27.0.0, pretty-format@^27.2.4:
   version "27.2.4"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.2.4.tgz#08ea39c5eab41b082852d7093059a091f6ddc748"
diff --git a/server/.eslintrc.js b/projects/server/.eslintrc.js
similarity index 100%
rename from server/.eslintrc.js
rename to projects/server/.eslintrc.js
diff --git a/server/.gitignore b/projects/server/.gitignore
similarity index 100%
rename from server/.gitignore
rename to projects/server/.gitignore
diff --git a/server/.snyk b/projects/server/.snyk
similarity index 100%
rename from server/.snyk
rename to projects/server/.snyk
diff --git a/server/README.md b/projects/server/README.md
similarity index 100%
rename from server/README.md
rename to projects/server/README.md
diff --git a/server/docker-compose.dev.yml b/projects/server/docker-compose.dev.yml
similarity index 100%
rename from server/docker-compose.dev.yml
rename to projects/server/docker-compose.dev.yml
diff --git a/server/nest-cli.json b/projects/server/nest-cli.json
similarity index 100%
rename from server/nest-cli.json
rename to projects/server/nest-cli.json
diff --git a/server/package.json b/projects/server/package.json
similarity index 94%
rename from server/package.json
rename to projects/server/package.json
index 011fd9b..f406b8a 100644
--- a/server/package.json
+++ b/projects/server/package.json
@@ -9,12 +9,11 @@
     "prebuild": "rimraf dist",
     "build": "nest build",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "prettier": "prettier --check src",
     "start": "NODE_ENV=development DEBUG=true nest start",
     "start:dev": "NODE_ENV=development nest start --watch",
     "start:debug": "NODE_ENV=development nest start --debug --watch",
     "start:prod": "NODE_ENV=production node dist/src/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "lint": "eslint \"{src,test}/**/*.ts\"",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
@@ -75,8 +74,6 @@
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-prettier": "^3.4.1",
     "jest": "^27.2.4",
-    "prettier": "^2.4.1",
-    "prettier-plugin-organize-imports": "^2.3.4",
     "supertest": "^6.1.6",
     "ts-jest": "^27.0.5",
     "ts-loader": "^9.2.6",
diff --git a/server/src/app.controller.ts b/projects/server/src/app.controller.ts
similarity index 99%
rename from server/src/app.controller.ts
rename to projects/server/src/app.controller.ts
index b7ea75f..fb1d15d 100644
--- a/server/src/app.controller.ts
+++ b/projects/server/src/app.controller.ts
@@ -20,7 +20,7 @@ export class AppController {
       passport: {
         user: { id },
       },
-    },
+    }
   ): Promise<User> {
     const user = await this.usersService.getById(id, ['team']);
     delete user.password;
diff --git a/server/src/app.module.ts b/projects/server/src/app.module.ts
similarity index 100%
rename from server/src/app.module.ts
rename to projects/server/src/app.module.ts
diff --git a/server/src/app.service.ts b/projects/server/src/app.service.ts
similarity index 95%
rename from server/src/app.service.ts
rename to projects/server/src/app.service.ts
index 1176abf..3dc51af 100644
--- a/server/src/app.service.ts
+++ b/projects/server/src/app.service.ts
@@ -29,7 +29,7 @@ const roles: Partial<Role>[] = [
 export class AppService {
   constructor(
     private readonly usersService: UsersService,
-    private readonly rolesService: RolesService,
+    private readonly rolesService: RolesService
   ) {
     this.initDatabase();
   }
diff --git a/server/src/core/config.ts b/projects/server/src/core/config.ts
similarity index 100%
rename from server/src/core/config.ts
rename to projects/server/src/core/config.ts
diff --git a/server/src/core/extended-repository.ts b/projects/server/src/core/extended-repository.ts
similarity index 94%
rename from server/src/core/extended-repository.ts
rename to projects/server/src/core/extended-repository.ts
index 3f61b00..5d7d910 100644
--- a/server/src/core/extended-repository.ts
+++ b/projects/server/src/core/extended-repository.ts
@@ -10,7 +10,7 @@ export class ExtendedRepository<Entity extends ObjectLiteral> extends Repository
   findOneOrThrow(
     id?: string | number | Date | ObjectID,
     options?: FindOneOptions<Entity>,
-    exception?: Error,
+    exception?: Error
   ): Promise<Entity>;
 
   findOneOrThrow(id?: string | number | Date | ObjectID, exception?: Error): Promise<Entity>;
@@ -22,7 +22,7 @@ export class ExtendedRepository<Entity extends ObjectLiteral> extends Repository
   findOneOrThrow(
     conditions?: FindConditions<Entity>,
     options?: FindOneOptions<Entity>,
-    exception?: Error,
+    exception?: Error
   ): Promise<Entity>;
 
   async findOneOrThrow(
@@ -34,13 +34,13 @@ export class ExtendedRepository<Entity extends ObjectLiteral> extends Repository
       | FindOneOptions<Entity>
       | FindConditions<Entity>,
     optionsOrException?: FindOneOptions<Entity> | Error,
-    maybeException?: Error,
+    maybeException?: Error
   ): Promise<Entity> {
     try {
       return await this.manager.findOneOrFail(
         this.metadata.target,
         optionsOrConditions as any,
-        optionsOrException instanceof Error ? undefined : optionsOrException,
+        optionsOrException instanceof Error ? undefined : optionsOrException
       );
     } catch (_) {
       throw maybeException ? maybeException : optionsOrException;
diff --git a/server/src/core/log.decorator.ts b/projects/server/src/core/log.decorator.ts
similarity index 95%
rename from server/src/core/log.decorator.ts
rename to projects/server/src/core/log.decorator.ts
index d4afeb3..5d4df22 100644
--- a/server/src/core/log.decorator.ts
+++ b/projects/server/src/core/log.decorator.ts
@@ -6,7 +6,7 @@ const decorateMethod =
   (
     target: any,
     propertyKey: string | symbol,
-    descriptor: PropertyDescriptor,
+    descriptor: PropertyDescriptor
   ): PropertyDescriptor => {
     const currentMethod = descriptor.value;
     const metadataKeys = Reflect.getMetadataKeys(currentMethod);
@@ -53,7 +53,7 @@ const decorateMethod =
 export const LogClass: ClassDecorator = ({ name, prototype }) => {
   const logger = LoggerFactory.getInstance(name);
   const methodNames = Object.getOwnPropertyNames(prototype).filter(
-    (propertyName) => propertyName !== 'constructor' && prototype[propertyName] instanceof Function,
+    (propertyName) => propertyName !== 'constructor' && prototype[propertyName] instanceof Function
   );
 
   for (const methodName of methodNames) {
@@ -64,7 +64,7 @@ export const LogClass: ClassDecorator = ({ name, prototype }) => {
     Object.defineProperty(
       prototype,
       methodName,
-      decorateMethod(logger)(prototype, methodName, descriptor) as PropertyDescriptor,
+      decorateMethod(logger)(prototype, methodName, descriptor) as PropertyDescriptor
     );
   }
 };
diff --git a/server/src/core/logger.factory.ts b/projects/server/src/core/logger.factory.ts
similarity index 100%
rename from server/src/core/logger.factory.ts
rename to projects/server/src/core/logger.factory.ts
diff --git a/server/src/core/roles.decorator.ts b/projects/server/src/core/roles.decorator.ts
similarity index 100%
rename from server/src/core/roles.decorator.ts
rename to projects/server/src/core/roles.decorator.ts
diff --git a/server/src/core/session.ts b/projects/server/src/core/session.ts
similarity index 100%
rename from server/src/core/session.ts
rename to projects/server/src/core/session.ts
diff --git a/server/src/core/socket-io.adapter.ts b/projects/server/src/core/socket-io.adapter.ts
similarity index 92%
rename from server/src/core/socket-io.adapter.ts
rename to projects/server/src/core/socket-io.adapter.ts
index d2f2167..26d7097 100644
--- a/server/src/core/socket-io.adapter.ts
+++ b/projects/server/src/core/socket-io.adapter.ts
@@ -15,7 +15,7 @@ export class SocketIoAdapter extends AbstractWsAdapter {
 
   public create(
     port: number,
-    options?: { namespace?: string; server?: Server },
+    options?: { namespace?: string; server?: Server }
   ): Server | Namespace {
     if (!options) {
       return this.createIOServer(port);
@@ -32,8 +32,8 @@ export class SocketIoAdapter extends AbstractWsAdapter {
         session(
           socket.request as Request,
           (socket.request as Request).res ?? ({} as Response),
-          () => next(),
-        ),
+          () => next()
+        )
       );
     }
     return newServer;
@@ -49,7 +49,7 @@ export class SocketIoAdapter extends AbstractWsAdapter {
   public bindMessageHandlers(
     client: any,
     handlers: MessageMappingProperties[],
-    transform: (data: any) => Observable<any>,
+    transform: (data: any) => Observable<any>
   ) {
     const disconnect$ = fromEvent(client, DISCONNECT_EVENT).pipe(share(), first());
 
@@ -59,10 +59,10 @@ export class SocketIoAdapter extends AbstractWsAdapter {
           const { data, ack } = this.mapPayload(payload);
           return transform(callback(data, ack)).pipe(
             filter((response: any) => !isNil(response)),
-            map((response: any) => [response, ack]),
+            map((response: any) => [response, ack])
           );
         }),
-        takeUntil(disconnect$),
+        takeUntil(disconnect$)
       );
       source$.subscribe(([response, ack]) => {
         if (response.event) {
diff --git a/server/src/core/utils.ts b/projects/server/src/core/utils.ts
similarity index 98%
rename from server/src/core/utils.ts
rename to projects/server/src/core/utils.ts
index ae1444e..f491899 100644
--- a/server/src/core/utils.ts
+++ b/projects/server/src/core/utils.ts
@@ -8,7 +8,7 @@ export function getFirstJudging(submission: Submission): Judging | undefined {
 export function submissionHasResult(
   { verificationRequired }: Contest,
   results: JudgingResult[],
-  inverse = false,
+  inverse = false
 ): (submission: Submission) => boolean {
   return (submission) => {
     const judging = getFirstJudging(submission);
diff --git a/server/src/entities/clarification-message.entity.ts b/projects/server/src/entities/clarification-message.entity.ts
similarity index 100%
rename from server/src/entities/clarification-message.entity.ts
rename to projects/server/src/entities/clarification-message.entity.ts
diff --git a/server/src/entities/clarification.entity.ts b/projects/server/src/entities/clarification.entity.ts
similarity index 100%
rename from server/src/entities/clarification.entity.ts
rename to projects/server/src/entities/clarification.entity.ts
diff --git a/server/src/entities/contest-problem.entity.ts b/projects/server/src/entities/contest-problem.entity.ts
similarity index 100%
rename from server/src/entities/contest-problem.entity.ts
rename to projects/server/src/entities/contest-problem.entity.ts
diff --git a/server/src/entities/contest.entity.ts b/projects/server/src/entities/contest.entity.ts
similarity index 100%
rename from server/src/entities/contest.entity.ts
rename to projects/server/src/entities/contest.entity.ts
diff --git a/server/src/entities/executable.entity.ts b/projects/server/src/entities/executable.entity.ts
similarity index 100%
rename from server/src/entities/executable.entity.ts
rename to projects/server/src/entities/executable.entity.ts
diff --git a/server/src/entities/file-content.entity.ts b/projects/server/src/entities/file-content.entity.ts
similarity index 100%
rename from server/src/entities/file-content.entity.ts
rename to projects/server/src/entities/file-content.entity.ts
diff --git a/server/src/entities/file.entity.ts b/projects/server/src/entities/file.entity.ts
similarity index 100%
rename from server/src/entities/file.entity.ts
rename to projects/server/src/entities/file.entity.ts
diff --git a/server/src/entities/index.ts b/projects/server/src/entities/index.ts
similarity index 100%
rename from server/src/entities/index.ts
rename to projects/server/src/entities/index.ts
diff --git a/server/src/entities/judge-host.entity.ts b/projects/server/src/entities/judge-host.entity.ts
similarity index 100%
rename from server/src/entities/judge-host.entity.ts
rename to projects/server/src/entities/judge-host.entity.ts
diff --git a/server/src/entities/judging-run.entity.ts b/projects/server/src/entities/judging-run.entity.ts
similarity index 100%
rename from server/src/entities/judging-run.entity.ts
rename to projects/server/src/entities/judging-run.entity.ts
diff --git a/server/src/entities/judging.entity.ts b/projects/server/src/entities/judging.entity.ts
similarity index 100%
rename from server/src/entities/judging.entity.ts
rename to projects/server/src/entities/judging.entity.ts
diff --git a/server/src/entities/language.entity.ts b/projects/server/src/entities/language.entity.ts
similarity index 100%
rename from server/src/entities/language.entity.ts
rename to projects/server/src/entities/language.entity.ts
diff --git a/server/src/entities/problem.entity.ts b/projects/server/src/entities/problem.entity.ts
similarity index 100%
rename from server/src/entities/problem.entity.ts
rename to projects/server/src/entities/problem.entity.ts
diff --git a/server/src/entities/role.entity.ts b/projects/server/src/entities/role.entity.ts
similarity index 100%
rename from server/src/entities/role.entity.ts
rename to projects/server/src/entities/role.entity.ts
diff --git a/server/src/entities/score-cache.entity.ts b/projects/server/src/entities/score-cache.entity.ts
similarity index 100%
rename from server/src/entities/score-cache.entity.ts
rename to projects/server/src/entities/score-cache.entity.ts
diff --git a/server/src/entities/submission.entity.ts b/projects/server/src/entities/submission.entity.ts
similarity index 100%
rename from server/src/entities/submission.entity.ts
rename to projects/server/src/entities/submission.entity.ts
diff --git a/server/src/entities/team-category.entity.ts b/projects/server/src/entities/team-category.entity.ts
similarity index 100%
rename from server/src/entities/team-category.entity.ts
rename to projects/server/src/entities/team-category.entity.ts
diff --git a/server/src/entities/team.entity.ts b/projects/server/src/entities/team.entity.ts
similarity index 100%
rename from server/src/entities/team.entity.ts
rename to projects/server/src/entities/team.entity.ts
diff --git a/server/src/entities/testcase.entity.ts b/projects/server/src/entities/testcase.entity.ts
similarity index 100%
rename from server/src/entities/testcase.entity.ts
rename to projects/server/src/entities/testcase.entity.ts
diff --git a/server/src/entities/user.entity.ts b/projects/server/src/entities/user.entity.ts
similarity index 100%
rename from server/src/entities/user.entity.ts
rename to projects/server/src/entities/user.entity.ts
diff --git a/server/src/features/auth/auth.controller.ts b/projects/server/src/features/auth/auth.controller.ts
similarity index 100%
rename from server/src/features/auth/auth.controller.ts
rename to projects/server/src/features/auth/auth.controller.ts
diff --git a/server/src/features/auth/auth.module.ts b/projects/server/src/features/auth/auth.module.ts
similarity index 100%
rename from server/src/features/auth/auth.module.ts
rename to projects/server/src/features/auth/auth.module.ts
diff --git a/server/src/features/auth/auth.service.ts b/projects/server/src/features/auth/auth.service.ts
similarity index 93%
rename from server/src/features/auth/auth.service.ts
rename to projects/server/src/features/auth/auth.service.ts
index 92fd3a6..bd081e6 100644
--- a/server/src/features/auth/auth.service.ts
+++ b/projects/server/src/features/auth/auth.service.ts
@@ -11,7 +11,7 @@ export class AuthService {
   async validateUser(username: string, password: string): Promise<Omit<User, 'password'> | null> {
     const user = await this.usersService.findOneOrThrow(
       { username, enabled: true },
-      new NotFoundException('User not found!'),
+      new NotFoundException('User not found!')
     );
     if (user.checkPassword(password)) {
       delete user.password;
diff --git a/server/src/features/auth/local.strategy.ts b/projects/server/src/features/auth/local.strategy.ts
similarity index 100%
rename from server/src/features/auth/local.strategy.ts
rename to projects/server/src/features/auth/local.strategy.ts
diff --git a/server/src/features/auth/session.serializer.ts b/projects/server/src/features/auth/session.serializer.ts
similarity index 100%
rename from server/src/features/auth/session.serializer.ts
rename to projects/server/src/features/auth/session.serializer.ts
diff --git a/server/src/features/clarifications/clarifications.module.ts b/projects/server/src/features/clarifications/clarifications.module.ts
similarity index 100%
rename from server/src/features/clarifications/clarifications.module.ts
rename to projects/server/src/features/clarifications/clarifications.module.ts
diff --git a/server/src/features/clarifications/clarifications.service.ts b/projects/server/src/features/clarifications/clarifications.service.ts
similarity index 62%
rename from server/src/features/clarifications/clarifications.service.ts
rename to projects/server/src/features/clarifications/clarifications.service.ts
index c71aaa4..e83353a 100644
--- a/server/src/features/clarifications/clarifications.service.ts
+++ b/projects/server/src/features/clarifications/clarifications.service.ts
@@ -11,30 +11,43 @@ export class ClarificationsService {
     @InjectRepository(Clarification)
     private readonly clarificationsRepository: ExtendedRepository<Clarification>,
     @InjectRepository(ClarificationMessage)
-    private readonly clarificationMessagesRepository: ExtendedRepository<ClarificationMessage>,
+    private readonly clarificationMessagesRepository: ExtendedRepository<ClarificationMessage>
   ) {}
 
   getByContestId(contestId: number): Promise<Clarification[]> {
-    return this.clarificationsRepository.find({ contest: { id: contestId } });
+    return this.clarificationsRepository.find({
+      where: { contest: { id: contestId } },
+      relations: ['team', 'problem', 'messages', 'messages.sentBy'],
+    });
   }
 
   getByContestIdAndTeamId(contestId: number, teamId: number): Promise<Clarification[]> {
-    return this.clarificationsRepository.find({
-      where: { contest: { id: contestId }, team: { id: teamId } },
-      relations: ['problem', 'messages', 'messages.sentBy'],
-    });
+    return this.getByContestId(contestId).then((result) =>
+      result.filter((item) => !item.team || item.team.id === teamId)
+    );
   }
 
   getByIdAndContestId(id: number, contestId: number): Promise<Clarification> {
     return this.clarificationsRepository.findOneOrThrow(
       {
         where: { id, contest: { id: contestId } },
-        relations: ['problem', 'messages', 'messages.sentBy'],
+        relations: ['team', 'problem', 'messages', 'messages.sentBy'],
       },
-      new NotFoundException('Clarification not found!'),
+      new NotFoundException('Clarification not found!')
     );
   }
 
+  getMessageByClarificationIdAndContestId(
+    id: number,
+    clarificationId: number,
+    contestId: number
+  ): Promise<ClarificationMessage> {
+    return this.clarificationMessagesRepository.findOneOrFail({
+      where: { id, clarification: { id: clarificationId, contest: { id: contestId } } },
+      relations: ['sentBy', 'clarification', 'clarification.contest'],
+    });
+  }
+
   save(clarification: Clarification): Promise<Clarification> {
     return this.clarificationsRepository.save(clarification);
   }
diff --git a/server/src/features/contests/contest-problems.service.ts b/projects/server/src/features/contests/contest-problems.service.ts
similarity index 97%
rename from server/src/features/contests/contest-problems.service.ts
rename to projects/server/src/features/contests/contest-problems.service.ts
index ca3ff96..86b00ca 100644
--- a/server/src/features/contests/contest-problems.service.ts
+++ b/projects/server/src/features/contests/contest-problems.service.ts
@@ -9,7 +9,7 @@ import { ContestProblem } from '../../entities';
 export class ContestProblemsService {
   constructor(
     @InjectRepository(ContestProblem)
-    private readonly contestProblemsRepository: ExtendedRepository<ContestProblem>,
+    private readonly contestProblemsRepository: ExtendedRepository<ContestProblem>
   ) {}
 
   getByContestId(id: number): Promise<ContestProblem[]> {
diff --git a/server/src/features/contests/contests.controller.ts b/projects/server/src/features/contests/contests.controller.ts
similarity index 82%
rename from server/src/features/contests/contests.controller.ts
rename to projects/server/src/features/contests/contests.controller.ts
index 4ab9b79..4055483 100644
--- a/server/src/features/contests/contests.controller.ts
+++ b/projects/server/src/features/contests/contests.controller.ts
@@ -46,7 +46,7 @@ export class ContestsController {
     private readonly languagesService: LanguagesService,
     private readonly scoreboardService: ScoreboardService,
     private readonly submissionsService: SubmissionsService,
-    private readonly clarificationsService: ClarificationsService,
+    private readonly clarificationsService: ClarificationsService
   ) {}
 
   @ApiOkResponse({ description: 'List of contests', type: [Contest] })
@@ -69,7 +69,7 @@ export class ContestsController {
   async update(@NumberParam('id') id: number, @Body() contest: Contest): Promise<Contest> {
     contest = await this.contestsService.update(id, contest);
     await this.scoreboardService.refreshScoreForContest(contest);
-    this.socketService.pingForUpdates('contests', 'submissions');
+    this.socketService.pingForUpdates('all', 'contests', 'submissions');
     return contest;
   }
 
@@ -106,13 +106,43 @@ export class ContestsController {
   })
   @Get(':id/team/:teamId/clarifications')
   @Roles('admin', 'team')
-  async getClarificationsForTeam(
+  getClarificationsForTeam(
     @NumberParam('id') contestId: number,
-    @NumberParam('teamId') teamId: number,
+    @NumberParam('teamId') teamId: number
   ): Promise<Clarification[]> {
     return this.clarificationsService.getByContestIdAndTeamId(contestId, teamId);
   }
 
+  @ApiOkResponse({ description: 'Set a clarification message as seen' })
+  @Patch(':id/clarifications/:clarificationId/message/:messageId/set-as-seen')
+  @Roles('admin', 'team', 'jury')
+  async setClarificationMessageAsSeen(
+    @NumberParam('id') contestId: number,
+    @NumberParam('clarificationId') clarificationId: number,
+    @NumberParam('messageId') messageId: number,
+    @Session()
+    {
+      passport: {
+        user: { id: userId },
+      },
+    }
+  ): Promise<void> {
+    const clarificationMessage =
+      await this.clarificationsService.getMessageByClarificationIdAndContestId(
+        messageId,
+        clarificationId,
+        contestId
+      );
+
+    if (clarificationMessage.sentBy.id === userId) {
+      throw new BadRequestException();
+    }
+
+    clarificationMessage.seen = true;
+
+    await this.clarificationsService.saveMessage(clarificationMessage);
+  }
+
   @ApiCreatedResponse({ description: 'Clarification messages saved', type: Clarification })
   @ApiNotFoundResponse({ description: 'Team or Clarification not found' })
   @Post(':id/clarifications')
@@ -125,13 +155,13 @@ export class ContestsController {
         user: { id: userId, role },
       },
     },
-    @Body() clarification: Clarification,
+    @Body() clarification: Clarification
   ): Promise<Clarification> {
     clarification.contest = { id: contestId } as Contest;
     if (clarification.id) {
       const dbClarification = await this.clarificationsService.getByIdAndContestId(
         clarification.id,
-        contestId,
+        contestId
       );
       await Promise.all(
         clarification.messages
@@ -142,7 +172,7 @@ export class ContestsController {
             sentTime: new Date(),
             clarification: dbClarification,
           }))
-          .map((message) => this.clarificationsService.saveMessage(message)),
+          .map((message) => this.clarificationsService.saveMessage(message))
       );
     } else {
       if (role.name === 'team') {
@@ -156,6 +186,14 @@ export class ContestsController {
         });
       clarification = await this.clarificationsService.save(clarification);
     }
+    if (role.name === 'team') {
+      this.socketService.pingForUpdates('juries', 'clarifications');
+    } else {
+      this.socketService.pingForUpdates(
+        clarification.team ? `team-${clarification.team.id}` : 'all',
+        'clarifications'
+      );
+    }
     return this.clarificationsService.getByIdAndContestId(clarification.id, contestId);
   }
 
@@ -166,7 +204,7 @@ export class ContestsController {
     @NumberParam('id') contestId: number,
     @NumberParam('teamId') teamId: number,
     @Session()
-    { passport: { user } },
+    { passport: { user } }
   ): Promise<Submission[]> {
     if (user.role.name === 'team') {
       const team = await this.teamsService.getByUserId(user.id);
@@ -190,12 +228,12 @@ export class ContestsController {
         user: { id: userId },
       },
     },
-    @Body() submission: Submission,
+    @Body() submission: Submission
   ): Promise<void> {
     submission.submitTime = new Date();
     const contest = await this.contestsService.getByIdAndRunningInTime(
       contestId,
-      submission.submitTime,
+      submission.submitTime
     );
     const team = await this.teamsService.getByUserId(userId);
     if (!contest?.openToAllTeams && !contest?.teams.find((t) => t.id === team.id)) {
@@ -204,19 +242,19 @@ export class ContestsController {
     const language = await this.languagesService.getById(submission.language.id);
     if (!language?.allowSubmit) {
       throw new BadRequestException(
-        `It is not allowed to submit using the language '${language.name}'`,
+        `It is not allowed to submit using the language '${language.name}'`
       );
     }
     const contestProblem = contest.problems.find((p) => submission.problem.id === p.problem.id);
     if (!contestProblem?.allowSubmit) {
       throw new BadRequestException(
-        `It is not allowed to submit to the problem '${contestProblem.shortName} - ${contestProblem.problem.name}'`,
+        `It is not allowed to submit to the problem '${contestProblem.shortName} - ${contestProblem.problem.name}'`
       );
     }
     submission.contest = contest;
     submission.team = team;
     await this.submissionsService.save(submission);
     await this.scoreboardService.refreshScoreCache(contest, team, submission.problem);
-    this.socketService.pingForUpdates('submissions', 'judgeRuns');
+    this.socketService.pingForUpdates('all', 'submissions', 'judgeRuns');
   }
 }
diff --git a/server/src/features/contests/contests.module.ts b/projects/server/src/features/contests/contests.module.ts
similarity index 100%
rename from server/src/features/contests/contests.module.ts
rename to projects/server/src/features/contests/contests.module.ts
diff --git a/server/src/features/contests/contests.service.ts b/projects/server/src/features/contests/contests.service.ts
similarity index 94%
rename from server/src/features/contests/contests.service.ts
rename to projects/server/src/features/contests/contests.service.ts
index 6f2c92a..27d2210 100644
--- a/server/src/features/contests/contests.service.ts
+++ b/projects/server/src/features/contests/contests.service.ts
@@ -17,7 +17,7 @@ export class ContestsService {
     private readonly contestsRepository: ExtendedRepository<Contest>,
     private readonly contestProblemsService: ContestProblemsService,
     private readonly problemsService: ProblemsService,
-    private readonly teamsService: TeamsService,
+    private readonly teamsService: TeamsService
   ) {}
 
   getAll(): Promise<Contest[]> {
@@ -30,7 +30,7 @@ export class ContestsService {
         data.map((c) => ({
           ...c,
           problems: c.problems.filter((p) => p.problem !== null),
-        })),
+        }))
       );
   }
 
@@ -62,7 +62,7 @@ export class ContestsService {
   getById(id: number, relations: string[] = []): Promise<Contest> {
     return this.contestsRepository.findOneOrThrow(
       { where: { id }, relations },
-      new NotFoundException('Contest not found!'),
+      new NotFoundException('Contest not found!')
     );
   }
 
@@ -76,7 +76,7 @@ export class ContestsService {
         },
         relations: ['teams', 'problems', 'problems.problem'],
       },
-      new NotFoundException('Contest not found!'),
+      new NotFoundException('Contest not found!')
     );
   }
 
@@ -87,7 +87,7 @@ export class ContestsService {
   async update(id: number, contest: Contest): Promise<Contest> {
     const oldContest = await this.contestsRepository.findOneOrThrow(
       id,
-      new NotFoundException('Contest not found'),
+      new NotFoundException('Contest not found')
     );
     await this.contestProblemsService.deleteByContestId(id);
     return await this.contestsRepository.save({
diff --git a/server/src/features/executables/executables.controller.ts b/projects/server/src/features/executables/executables.controller.ts
similarity index 100%
rename from server/src/features/executables/executables.controller.ts
rename to projects/server/src/features/executables/executables.controller.ts
diff --git a/server/src/features/executables/executables.module.ts b/projects/server/src/features/executables/executables.module.ts
similarity index 100%
rename from server/src/features/executables/executables.module.ts
rename to projects/server/src/features/executables/executables.module.ts
diff --git a/server/src/features/executables/executables.service.ts b/projects/server/src/features/executables/executables.service.ts
similarity index 89%
rename from server/src/features/executables/executables.service.ts
rename to projects/server/src/features/executables/executables.service.ts
index bd2cfee..820ba31 100644
--- a/server/src/features/executables/executables.service.ts
+++ b/projects/server/src/features/executables/executables.service.ts
@@ -9,7 +9,7 @@ import { Executable, ExecutableType } from '../../entities';
 export class ExecutablesService {
   constructor(
     @InjectRepository(Executable)
-    private readonly executablesRepository: ExtendedRepository<Executable>,
+    private readonly executablesRepository: ExtendedRepository<Executable>
   ) {}
 
   getAll(): Promise<Executable[]> {
@@ -26,14 +26,14 @@ export class ExecutablesService {
   getById(id: number, relations: string[] = []): Promise<Executable> {
     return this.executablesRepository.findOneOrThrow(
       { where: { id }, relations },
-      new NotFoundException('Executable not found!'),
+      new NotFoundException('Executable not found!')
     );
   }
 
   getDefaultByType(type: ExecutableType): Promise<Executable> {
     return this.executablesRepository.findOneOrThrow(
       { type },
-      new NotFoundException('Executable not found!'),
+      new NotFoundException('Executable not found!')
     );
   }
 
@@ -41,7 +41,7 @@ export class ExecutablesService {
     if (executable.default) {
       await this.executablesRepository.update(
         { type: executable.type, default: true },
-        { default: false },
+        { default: false }
       );
     }
     return this.executablesRepository.save(executable);
@@ -50,7 +50,7 @@ export class ExecutablesService {
   async update(id: number, executable: Executable): Promise<Executable> {
     const oldExecutable = await this.executablesRepository.findOneOrThrow(
       id,
-      new NotFoundException('Executable not found!'),
+      new NotFoundException('Executable not found!')
     );
     return this.save({ ...oldExecutable, ...executable });
   }
diff --git a/server/src/features/files/files.module.ts b/projects/server/src/features/files/files.module.ts
similarity index 100%
rename from server/src/features/files/files.module.ts
rename to projects/server/src/features/files/files.module.ts
diff --git a/server/src/features/files/files.service.ts b/projects/server/src/features/files/files.service.ts
similarity index 82%
rename from server/src/features/files/files.service.ts
rename to projects/server/src/features/files/files.service.ts
index 810931b..4b57e78 100644
--- a/server/src/features/files/files.service.ts
+++ b/projects/server/src/features/files/files.service.ts
@@ -9,13 +9,13 @@ import { File } from '../../entities';
 export class FilesService {
   constructor(
     @InjectRepository(File)
-    private readonly filesRepository: ExtendedRepository<File>,
+    private readonly filesRepository: ExtendedRepository<File>
   ) {}
 
   getById(id: number, relations: string[] = []): Promise<File> {
     return this.filesRepository.findOneOrThrow(
       { where: { id }, relations },
-      new NotFoundException('File not found!'),
+      new NotFoundException('File not found!')
     );
   }
 }
diff --git a/server/src/features/judge-hosts/judge-hosts.controller.ts b/projects/server/src/features/judge-hosts/judge-hosts.controller.ts
similarity index 92%
rename from server/src/features/judge-hosts/judge-hosts.controller.ts
rename to projects/server/src/features/judge-hosts/judge-hosts.controller.ts
index 98c88e1..73dcc5d 100644
--- a/server/src/features/judge-hosts/judge-hosts.controller.ts
+++ b/projects/server/src/features/judge-hosts/judge-hosts.controller.ts
@@ -26,7 +26,7 @@ export class JudgeHostsController {
     private readonly submissionsService: SubmissionsService,
     private readonly judgeHostsService: JudgeHostsService,
     private readonly scoreboardService: ScoreboardService,
-    private readonly websocketGateway: WebsocketGateway,
+    private readonly websocketGateway: WebsocketGateway
   ) {}
 
   @Get()
@@ -62,7 +62,7 @@ export class JudgeHostsController {
   async updateJudging(
     @Param('hostname') hostname: string,
     @NumberParam('id') judgingId: number,
-    @Body() judging: Judging,
+    @Body() judging: Judging
   ): Promise<void> {
     const oldJudging = await this.judgingsService.getById(judgingId, [
       'contest',
@@ -74,9 +74,9 @@ export class JudgeHostsController {
     await this.scoreboardService.refreshScoreCache(
       oldJudging.contest,
       oldJudging.submission.team,
-      oldJudging.submission.problem,
+      oldJudging.submission.problem
     );
-    this.websocketGateway.pingForUpdates('judgings', 'submissions');
+    this.websocketGateway.pingForUpdates('juries', 'judgings', 'submissions');
   }
 
   @Post(':hostname/add-judging-run/:id')
@@ -84,11 +84,11 @@ export class JudgeHostsController {
   async addJudgingRun(
     @Param('hostname') hostname: string,
     @NumberParam('id') judgingId: number,
-    @Body() judgingRun: JudgingRun,
+    @Body() judgingRun: JudgingRun
   ): Promise<void> {
     await this.judgingsService.getById(judgingId);
     await this.judgingRunsService.save(judgingRun);
-    this.websocketGateway.pingForUpdates('judgeRuns');
+    this.websocketGateway.pingForUpdates('juries', 'judgeRuns');
   }
 
   @Get(':hostname/next-judging')
@@ -110,7 +110,7 @@ export class JudgeHostsController {
       await this.submissionsService.save(submission);
       judging.submission = submission;
       judging.judgeHost = judgeHost;
-      this.websocketGateway.pingForUpdates('judgings');
+      this.websocketGateway.pingForUpdates('juries', 'judgings');
       return judging;
     }
   }
diff --git a/server/src/features/judge-hosts/judge-hosts.module.ts b/projects/server/src/features/judge-hosts/judge-hosts.module.ts
similarity index 100%
rename from server/src/features/judge-hosts/judge-hosts.module.ts
rename to projects/server/src/features/judge-hosts/judge-hosts.module.ts
diff --git a/server/src/features/judge-hosts/judge-hosts.service.ts b/projects/server/src/features/judge-hosts/judge-hosts.service.ts
similarity index 95%
rename from server/src/features/judge-hosts/judge-hosts.service.ts
rename to projects/server/src/features/judge-hosts/judge-hosts.service.ts
index acaabde..f323c93 100644
--- a/server/src/features/judge-hosts/judge-hosts.service.ts
+++ b/projects/server/src/features/judge-hosts/judge-hosts.service.ts
@@ -9,7 +9,7 @@ import { JudgeHost } from '../../entities';
 export class JudgeHostsService {
   constructor(
     @InjectRepository(JudgeHost)
-    private readonly judgeHostsRepository: ExtendedRepository<JudgeHost>,
+    private readonly judgeHostsRepository: ExtendedRepository<JudgeHost>
   ) {}
 
   getAll(): Promise<JudgeHost[]> {
@@ -30,7 +30,7 @@ export class JudgeHostsService {
   async update(criteria: Partial<JudgeHost>, executable: Partial<JudgeHost>): Promise<JudgeHost> {
     const oldJudgeHost = await this.judgeHostsRepository.findOneOrThrow(
       criteria,
-      new NotFoundException('JudgeHost not found!'),
+      new NotFoundException('JudgeHost not found!')
     );
     return this.save({ ...oldJudgeHost, ...executable });
   }
diff --git a/server/src/features/judge-hosts/judging-runs.service.ts b/projects/server/src/features/judge-hosts/judging-runs.service.ts
similarity index 91%
rename from server/src/features/judge-hosts/judging-runs.service.ts
rename to projects/server/src/features/judge-hosts/judging-runs.service.ts
index 92371a8..1a22cdb 100644
--- a/server/src/features/judge-hosts/judging-runs.service.ts
+++ b/projects/server/src/features/judge-hosts/judging-runs.service.ts
@@ -9,13 +9,13 @@ import { JudgingRun } from '../../entities';
 export class JudgingRunsService {
   constructor(
     @InjectRepository(JudgingRun)
-    private readonly judgingRunsRepository: ExtendedRepository<JudgingRun>,
+    private readonly judgingRunsRepository: ExtendedRepository<JudgingRun>
   ) {}
 
   getById(id: number, relations: string[] = []): Promise<JudgingRun> {
     return this.judgingRunsRepository.findOneOrThrow(
       { where: { id }, relations },
-      new NotFoundException('Judging Run not found!'),
+      new NotFoundException('Judging Run not found!')
     );
   }
 
diff --git a/server/src/features/judge-hosts/judgings.service.ts b/projects/server/src/features/judge-hosts/judgings.service.ts
similarity index 90%
rename from server/src/features/judge-hosts/judgings.service.ts
rename to projects/server/src/features/judge-hosts/judgings.service.ts
index 2cd516d..b6160b2 100644
--- a/server/src/features/judge-hosts/judgings.service.ts
+++ b/projects/server/src/features/judge-hosts/judgings.service.ts
@@ -11,13 +11,13 @@ export class JudgingsService {
   constructor(
     @InjectRepository(Judging)
     private readonly judgingsRepository: ExtendedRepository<Judging>,
-    private readonly scoreboardService: ScoreboardService,
+    private readonly scoreboardService: ScoreboardService
   ) {}
 
   getById(id: number, relations: string[] = []): Promise<Judging> {
     return this.judgingsRepository.findOneOrThrow(
       { where: { id }, relations },
-      new NotFoundException('Judging not found!'),
+      new NotFoundException('Judging not found!')
     );
   }
 
@@ -43,7 +43,7 @@ export class JudgingsService {
         relations: ['contest', 'submission', 'submission.team', 'submission.problem'],
         order: { startTime: 'DESC' },
       },
-      new NotFoundException(),
+      new NotFoundException()
     );
     await this.judgingsRepository.update(judgingId, {
       juryMember: { id: userId },
@@ -58,7 +58,7 @@ export class JudgingsService {
         where: { submission: { id } },
         order: { startTime: 'DESC' },
       },
-      new NotFoundException('Judging not found!'),
+      new NotFoundException('Judging not found!')
     );
     await this.judgingsRepository.update(judging.id, {
       juryMember: value,
diff --git a/server/src/features/languages/languages.controller.ts b/projects/server/src/features/languages/languages.controller.ts
similarity index 98%
rename from server/src/features/languages/languages.controller.ts
rename to projects/server/src/features/languages/languages.controller.ts
index ae667ce..30443a3 100644
--- a/server/src/features/languages/languages.controller.ts
+++ b/projects/server/src/features/languages/languages.controller.ts
@@ -33,10 +33,10 @@ export class LanguagesController {
           role: { name },
         },
       },
-    },
+    }
   ): Promise<Language[]> {
     return this.languagesService.getAll(
-      ['admin', 'jury'].includes(name) && ['buildScript', 'buildScript.content'],
+      ['admin', 'jury'].includes(name) && ['buildScript', 'buildScript.content']
     );
   }
 
diff --git a/server/src/features/languages/languages.module.ts b/projects/server/src/features/languages/languages.module.ts
similarity index 100%
rename from server/src/features/languages/languages.module.ts
rename to projects/server/src/features/languages/languages.module.ts
diff --git a/server/src/features/languages/languages.service.ts b/projects/server/src/features/languages/languages.service.ts
similarity index 91%
rename from server/src/features/languages/languages.service.ts
rename to projects/server/src/features/languages/languages.service.ts
index 378d066..400784e 100644
--- a/server/src/features/languages/languages.service.ts
+++ b/projects/server/src/features/languages/languages.service.ts
@@ -9,7 +9,7 @@ import { Language } from '../../entities';
 export class LanguagesService {
   constructor(
     @InjectRepository(Language)
-    private readonly languagesRepository: ExtendedRepository<Language>,
+    private readonly languagesRepository: ExtendedRepository<Language>
   ) {}
 
   getAll(relations?: string[]): Promise<Language[]> {
@@ -22,7 +22,7 @@ export class LanguagesService {
   getById(id: number, relations: string[] = []): Promise<Language> {
     return this.languagesRepository.findOneOrThrow(
       { where: { id }, relations },
-      new NotFoundException('Language not found!'),
+      new NotFoundException('Language not found!')
     );
   }
 
@@ -33,7 +33,7 @@ export class LanguagesService {
   async update(id: number, language: Language): Promise<Language> {
     const oldLanguage = await this.languagesRepository.findOneOrThrow(
       id,
-      new NotFoundException('Language not found!'),
+      new NotFoundException('Language not found!')
     );
     return this.save({ ...oldLanguage, ...language });
   }
diff --git a/server/src/features/problems/problems.controller.ts b/projects/server/src/features/problems/problems.controller.ts
similarity index 96%
rename from server/src/features/problems/problems.controller.ts
rename to projects/server/src/features/problems/problems.controller.ts
index 68a2057..b80f4ba 100644
--- a/server/src/features/problems/problems.controller.ts
+++ b/projects/server/src/features/problems/problems.controller.ts
@@ -16,7 +16,7 @@ import { ProblemsService } from './problems.service';
 export class ProblemsController {
   constructor(
     private readonly problemsService: ProblemsService,
-    private readonly submissionsService: SubmissionsService,
+    private readonly submissionsService: SubmissionsService
   ) {}
 
   @Get()
diff --git a/server/src/features/problems/problems.module.ts b/projects/server/src/features/problems/problems.module.ts
similarity index 100%
rename from server/src/features/problems/problems.module.ts
rename to projects/server/src/features/problems/problems.module.ts
diff --git a/server/src/features/problems/problems.service.ts b/projects/server/src/features/problems/problems.service.ts
similarity index 91%
rename from server/src/features/problems/problems.service.ts
rename to projects/server/src/features/problems/problems.service.ts
index 2b29cf9..395274a 100644
--- a/server/src/features/problems/problems.service.ts
+++ b/projects/server/src/features/problems/problems.service.ts
@@ -13,7 +13,7 @@ export class ProblemsService {
     @InjectRepository(Problem)
     private readonly problemsRepository: ExtendedRepository<Problem>,
     private readonly executablesService: ExecutablesService,
-    private readonly testcasesService: TestcasesService,
+    private readonly testcasesService: TestcasesService
   ) {}
 
   getAll(): Promise<Problem[]> {
@@ -30,7 +30,7 @@ export class ProblemsService {
   getById(id: number, relations: string[] = []): Promise<Problem> {
     return this.problemsRepository.findOneOrThrow(
       { where: { id }, relations },
-      new NotFoundException('Problem not found!'),
+      new NotFoundException('Problem not found!')
     );
   }
 
@@ -41,7 +41,7 @@ export class ProblemsService {
   async update(id: number, problem: Problem): Promise<Problem> {
     const oldProblem = await this.problemsRepository.findOneOrThrow(
       id,
-      new NotFoundException('Problem not found!'),
+      new NotFoundException('Problem not found!')
     );
     return this.save({ ...oldProblem, ...problem });
   }
@@ -56,7 +56,7 @@ export class ProblemsService {
     const testcases = problem.testcases;
     problem = await this.problemsRepository.save(problem);
     await Promise.all(
-      testcases.map((testcase) => this.testcasesService.create(problem.id, testcase)),
+      testcases.map((testcase) => this.testcasesService.create(problem.id, testcase))
     );
     return problem;
   }
diff --git a/server/src/features/public/public.controller.ts b/projects/server/src/features/public/public.controller.ts
similarity index 95%
rename from server/src/features/public/public.controller.ts
rename to projects/server/src/features/public/public.controller.ts
index 9288faa..80a85b5 100644
--- a/server/src/features/public/public.controller.ts
+++ b/projects/server/src/features/public/public.controller.ts
@@ -16,7 +16,7 @@ export class PublicController {
     private readonly usersService: UsersService,
     private readonly contestsService: ContestsService,
     private readonly contestProblemsService: ContestProblemsService,
-    private readonly scoreCacheService: ScoreCacheService,
+    private readonly scoreCacheService: ScoreCacheService
   ) {}
 
   @Get('contests')
@@ -28,7 +28,7 @@ export class PublicController {
         return contests
           .filter(
             (contest) =>
-              contest.openToAllTeams || contest.teams.some((team) => team.id === user.team.id),
+              contest.openToAllTeams || contest.teams.some((team) => team.id === user.team.id)
           )
           .map(this.cleanProblems);
       case 'jury':
@@ -53,7 +53,7 @@ export class PublicController {
   @Get('contest/:id/score-caches')
   async getScoreCaches(
     @NumberParam('id') contestId: number,
-    @Session() session,
+    @Session() session
   ): Promise<ScoreCache[]> {
     const user = await this.usersService.findById(session?.passport?.user.id);
     return (
diff --git a/server/src/features/public/public.module.ts b/projects/server/src/features/public/public.module.ts
similarity index 100%
rename from server/src/features/public/public.module.ts
rename to projects/server/src/features/public/public.module.ts
diff --git a/server/src/features/scoreboard/score-cache.service.ts b/projects/server/src/features/scoreboard/score-cache.service.ts
similarity index 98%
rename from server/src/features/scoreboard/score-cache.service.ts
rename to projects/server/src/features/scoreboard/score-cache.service.ts
index 3fbc12d..fc8fd86 100644
--- a/server/src/features/scoreboard/score-cache.service.ts
+++ b/projects/server/src/features/scoreboard/score-cache.service.ts
@@ -9,7 +9,7 @@ import { ScoreCache } from '../../entities';
 export class ScoreCacheService {
   constructor(
     @InjectRepository(ScoreCache)
-    private readonly scoreCachesRepository: ExtendedRepository<ScoreCache>,
+    private readonly scoreCachesRepository: ExtendedRepository<ScoreCache>
   ) {}
 
   find(scoreCache: Partial<ScoreCache>, relations: string[] = []): Promise<ScoreCache[]> {
diff --git a/server/src/features/scoreboard/scoreboard.module.ts b/projects/server/src/features/scoreboard/scoreboard.module.ts
similarity index 100%
rename from server/src/features/scoreboard/scoreboard.module.ts
rename to projects/server/src/features/scoreboard/scoreboard.module.ts
diff --git a/server/src/features/scoreboard/scoreboard.service.ts b/projects/server/src/features/scoreboard/scoreboard.service.ts
similarity index 93%
rename from server/src/features/scoreboard/scoreboard.service.ts
rename to projects/server/src/features/scoreboard/scoreboard.service.ts
index e628763..cbdfb8b 100644
--- a/server/src/features/scoreboard/scoreboard.service.ts
+++ b/projects/server/src/features/scoreboard/scoreboard.service.ts
@@ -17,7 +17,7 @@ export class ScoreboardService {
     private readonly scoreCacheService: ScoreCacheService,
     private readonly contestsService: ContestsService,
     private readonly submissionsService: SubmissionsService,
-    private readonly socketService: WebsocketGateway,
+    private readonly socketService: WebsocketGateway
   ) {}
 
   @Interval(15 * 60 * 1000)
@@ -38,7 +38,7 @@ export class ScoreboardService {
     contest: Contest,
     team: Team,
     problem: Problem,
-    pingForUpdates = true,
+    pingForUpdates = true
   ): Promise<void> => {
     const isCorrect = submissionHasResult(contest, ['AC']);
     const isPending = submissionIsPending(contest);
@@ -46,11 +46,11 @@ export class ScoreboardService {
     const inFreezeTime = submissionInFreezeTime(contest);
     const allProblemSubmissions = await this.submissionsService.getByContestIdAndProblemId(
       contest.id,
-      problem.id,
+      problem.id
     );
 
     const submissions = allProblemSubmissions.filter(
-      (submission) => submission.team.id === team.id && !hasCompileError(submission),
+      (submission) => submission.team.id === team.id && !hasCompileError(submission)
     );
     const firstCorrectProblemSubmission = allProblemSubmissions.filter(isCorrect).shift();
 
@@ -102,7 +102,7 @@ export class ScoreboardService {
       }
     }
     await this.scoreCacheService.save(scoreCache);
-    pingForUpdates && this.socketService.pingForUpdates('scoreboard');
+    pingForUpdates && this.socketService.pingForUpdates('all', 'scoreboard');
   };
 
   refreshScoreForContest = async (contest: Contest): Promise<void> => {
@@ -115,6 +115,6 @@ export class ScoreboardService {
         await this.refreshScoreCache(contest, team, problem, false);
       }
     }
-    this.socketService.pingForUpdates('scoreboard');
+    this.socketService.pingForUpdates('all', 'scoreboard');
   };
 }
diff --git a/server/src/features/submissions/submissions.controller.ts b/projects/server/src/features/submissions/submissions.controller.ts
similarity index 89%
rename from server/src/features/submissions/submissions.controller.ts
rename to projects/server/src/features/submissions/submissions.controller.ts
index 0da1b50..343e01d 100644
--- a/server/src/features/submissions/submissions.controller.ts
+++ b/projects/server/src/features/submissions/submissions.controller.ts
@@ -40,7 +40,7 @@ export class SubmissionsController {
     private readonly judgingsService: JudgingsService,
     private readonly scoreboardService: ScoreboardService,
     private readonly submissionsService: SubmissionsService,
-    private readonly socketService: WebsocketGateway,
+    private readonly socketService: WebsocketGateway
   ) {}
 
   @ApiQuery({ name: 'page', required: false })
@@ -67,7 +67,7 @@ export class SubmissionsController {
     @Query('problems', new ParseArrayPipe({ items: Number, optional: true })) problems: number[],
     @Query('teams', new ParseArrayPipe({ items: Number, optional: true })) teams: number[],
     @Query('languages', new ParseArrayPipe({ items: Number, optional: true })) languages: number[],
-    @Query('status') status: 'notJudged' | 'notVerified' | undefined,
+    @Query('status') status: 'notJudged' | 'notVerified' | undefined
   ): Promise<[Submission[], number]> {
     return this.submissionsService.search(
       page,
@@ -76,7 +76,7 @@ export class SubmissionsController {
       problems,
       teams,
       languages,
-      status,
+      status
     );
   }
 
@@ -95,10 +95,10 @@ export class SubmissionsController {
       passport: {
         user: { id: userId },
       },
-    },
+    }
   ): Promise<void> {
     await this.judgingsService.setVerified(id, userId);
-    this.socketService.pingForUpdates('judgings', 'submissions');
+    this.socketService.pingForUpdates('all', 'judgings', 'submissions');
   }
 
   @Patch(':id/claim')
@@ -110,10 +110,10 @@ export class SubmissionsController {
       passport: {
         user: { id: userId },
       },
-    },
+    }
   ): Promise<void> {
     await this.judgingsService.setJuryMember(id, userId);
-    await this.socketService.pingForUpdates('judgings');
+    await this.socketService.pingForUpdates('juries', 'judgings');
   }
 
   @Patch(':id/un-claim')
@@ -125,38 +125,38 @@ export class SubmissionsController {
       passport: {
         user: { id: userId },
       },
-    },
+    }
   ): Promise<void> {
     await this.judgingsService.setJuryMember(id, userId, null);
-    await this.socketService.pingForUpdates('judgings');
+    await this.socketService.pingForUpdates('juries', 'judgings');
   }
 
   @Patch(':id/rejudge')
   @Roles('admin', 'jury')
   async rejudgeSubmission(@NumberParam('id') id: number): Promise<void> {
     await this.submissionsService.rejudge(id);
-    await this.socketService.pingForUpdates('judgings', 'submissions');
+    await this.socketService.pingForUpdates('all', 'judgings', 'submissions');
   }
 
   @Patch(':id/ignore')
   @Roles('admin', 'jury')
   async ignoreSubmission(@NumberParam('id') id: number): Promise<void> {
     await this.submissionsService.setValid(id, false);
-    this.socketService.pingForUpdates('judgings', 'submissions');
+    this.socketService.pingForUpdates('all', 'judgings', 'submissions');
   }
 
   @Patch(':id/un-ignore')
   @Roles('admin', 'jury')
   async unIgnoreSubmission(@NumberParam('id') id: number): Promise<void> {
     await this.submissionsService.setValid(id, true);
-    this.socketService.pingForUpdates('judgings', 'submissions');
+    this.socketService.pingForUpdates('all', 'judgings', 'submissions');
   }
 
   @Get(':id/run/:runId/content')
   @Roles('admin', 'judge-host')
   getRunContent(
     @NumberParam('id') id: number,
-    @NumberParam('runId') runId: number,
+    @NumberParam('runId') runId: number
   ): Promise<FileContent> {
     return this.judgingRunsService
       .getById(runId, ['runOutput'])
diff --git a/server/src/features/submissions/submissions.module.ts b/projects/server/src/features/submissions/submissions.module.ts
similarity index 100%
rename from server/src/features/submissions/submissions.module.ts
rename to projects/server/src/features/submissions/submissions.module.ts
diff --git a/server/src/features/submissions/submissions.service.ts b/projects/server/src/features/submissions/submissions.service.ts
similarity index 96%
rename from server/src/features/submissions/submissions.service.ts
rename to projects/server/src/features/submissions/submissions.service.ts
index 4a88d37..d421418 100644
--- a/server/src/features/submissions/submissions.service.ts
+++ b/projects/server/src/features/submissions/submissions.service.ts
@@ -15,7 +15,7 @@ export class SubmissionsService {
     private readonly submissionsRepository: ExtendedRepository<Submission>,
     @Inject(forwardRef(() => ScoreboardService))
     private readonly scoreboardService: ScoreboardService,
-    private readonly websocketGateway: WebsocketGateway,
+    private readonly websocketGateway: WebsocketGateway
   ) {}
 
   search(
@@ -25,7 +25,7 @@ export class SubmissionsService {
     problems?: number[],
     teams?: number[],
     languages?: number[],
-    status?: 'notJudged' | 'notVerified',
+    status?: 'notJudged' | 'notVerified'
   ): Promise<[Submission[], number]> {
     const notJudged = status === 'notJudged';
     const notVerified = status === 'notVerified';
@@ -63,13 +63,13 @@ export class SubmissionsService {
 
     if (notJudged) {
       query = query.andWhere(
-        '(SELECT COUNT(*) FROM "judging" WHERE "judging"."submissionId" = "submission"."id") = 0',
+        '(SELECT COUNT(*) FROM "judging" WHERE "judging"."submissionId" = "submission"."id") = 0'
       );
     }
 
     if (notVerified) {
       query = query.andWhere(
-        '(SELECT COUNT(*) FROM "judging" WHERE "judging"."submissionId" = "submission"."id" AND "judging"."verified" = FALSE) > 0',
+        '(SELECT COUNT(*) FROM "judging" WHERE "judging"."submissionId" = "submission"."id" AND "judging"."verified" = FALSE) > 0'
       );
     }
     return query.getManyAndCount();
@@ -101,7 +101,7 @@ export class SubmissionsService {
           'judgings.runs.errorOutput.content',
         ],
       },
-      new NotFoundException('Submission not found!'),
+      new NotFoundException('Submission not found!')
     );
   }
 
@@ -150,7 +150,7 @@ export class SubmissionsService {
         where: { id },
         relations: ['team', 'problem', 'contest'],
       },
-      new NotFoundException(),
+      new NotFoundException()
     );
     await this.submissionsRepository.update({ id }, { valid });
     await this.scoreboardService.refreshScoreCache(contest, team, problem);
diff --git a/server/src/features/team-categories/team-categories.controller.ts b/projects/server/src/features/team-categories/team-categories.controller.ts
similarity index 100%
rename from server/src/features/team-categories/team-categories.controller.ts
rename to projects/server/src/features/team-categories/team-categories.controller.ts
diff --git a/server/src/features/team-categories/team-categories.module.ts b/projects/server/src/features/team-categories/team-categories.module.ts
similarity index 100%
rename from server/src/features/team-categories/team-categories.module.ts
rename to projects/server/src/features/team-categories/team-categories.module.ts
diff --git a/server/src/features/team-categories/team-categories.service.ts b/projects/server/src/features/team-categories/team-categories.service.ts
similarity index 97%
rename from server/src/features/team-categories/team-categories.service.ts
rename to projects/server/src/features/team-categories/team-categories.service.ts
index 1378c29..519db4f 100644
--- a/server/src/features/team-categories/team-categories.service.ts
+++ b/projects/server/src/features/team-categories/team-categories.service.ts
@@ -11,7 +11,7 @@ import { TeamCategory } from '../../entities';
 export class TeamCategoriesService {
   constructor(
     @InjectRepository(TeamCategory)
-    private readonly teamCategoriesRepository: ExtendedRepository<TeamCategory>,
+    private readonly teamCategoriesRepository: ExtendedRepository<TeamCategory>
   ) {}
 
   getAll(): Promise<TeamCategory[]> {
@@ -24,7 +24,7 @@ export class TeamCategoriesService {
   getById(id: number, relations: string[] = []): Promise<TeamCategory> {
     return this.teamCategoriesRepository.findOneOrThrow(
       { where: { id }, relations },
-      new NotFoundException('Team Category not found!'),
+      new NotFoundException('Team Category not found!')
     );
   }
 
diff --git a/server/src/features/teams/teams.controller.ts b/projects/server/src/features/teams/teams.controller.ts
similarity index 100%
rename from server/src/features/teams/teams.controller.ts
rename to projects/server/src/features/teams/teams.controller.ts
diff --git a/server/src/features/teams/teams.module.ts b/projects/server/src/features/teams/teams.module.ts
similarity index 100%
rename from server/src/features/teams/teams.module.ts
rename to projects/server/src/features/teams/teams.module.ts
diff --git a/server/src/features/teams/teams.service.ts b/projects/server/src/features/teams/teams.service.ts
similarity index 92%
rename from server/src/features/teams/teams.service.ts
rename to projects/server/src/features/teams/teams.service.ts
index 3a68a47..39e7499 100644
--- a/server/src/features/teams/teams.service.ts
+++ b/projects/server/src/features/teams/teams.service.ts
@@ -9,7 +9,7 @@ import { Team } from '../../entities';
 export class TeamsService {
   constructor(
     @InjectRepository(Team)
-    private readonly teamsRepository: ExtendedRepository<Team>,
+    private readonly teamsRepository: ExtendedRepository<Team>
   ) {}
 
   getAll(): Promise<Team[]> {
@@ -22,7 +22,7 @@ export class TeamsService {
         teams.map((team) => {
           team.users.forEach((user) => user.clean());
           return team;
-        }),
+        })
       );
   }
 
@@ -34,7 +34,7 @@ export class TeamsService {
           '(SELECT COUNT(*) FROM "user" WHERE "user"."id" = :userId AND "user"."teamId" = "team"."id") > 0',
           {
             userId,
-          },
+          }
         )
         .getOneOrFail();
     } catch {
@@ -49,7 +49,7 @@ export class TeamsService {
   async update(id: number, team: Team): Promise<Team> {
     const oldTeam = await this.teamsRepository.findOneOrThrow(
       id,
-      new NotFoundException('Team not found!'),
+      new NotFoundException('Team not found!')
     );
     return this.save({ ...oldTeam, ...team });
   }
diff --git a/server/src/features/testcases/testcases.controller.ts b/projects/server/src/features/testcases/testcases.controller.ts
similarity index 97%
rename from server/src/features/testcases/testcases.controller.ts
rename to projects/server/src/features/testcases/testcases.controller.ts
index f2bfdf2..4b94c31 100644
--- a/server/src/features/testcases/testcases.controller.ts
+++ b/projects/server/src/features/testcases/testcases.controller.ts
@@ -54,7 +54,7 @@ export class TestcasesController {
   @Roles('admin', 'jury', 'judge-host')
   getContent(
     @NumberParam('id') id: number,
-    @Param('file') file: 'input' | 'output',
+    @Param('file') file: 'input' | 'output'
   ): Promise<FileContent> {
     if (!['input', 'output'].includes(file)) {
       throw new BadRequestException("file parameter should be either 'input' or 'output'");
diff --git a/server/src/features/testcases/testcases.module.ts b/projects/server/src/features/testcases/testcases.module.ts
similarity index 100%
rename from server/src/features/testcases/testcases.module.ts
rename to projects/server/src/features/testcases/testcases.module.ts
diff --git a/server/src/features/testcases/testcases.service.ts b/projects/server/src/features/testcases/testcases.service.ts
similarity index 96%
rename from server/src/features/testcases/testcases.service.ts
rename to projects/server/src/features/testcases/testcases.service.ts
index faf10a0..c22c7fa 100644
--- a/server/src/features/testcases/testcases.service.ts
+++ b/projects/server/src/features/testcases/testcases.service.ts
@@ -13,13 +13,13 @@ export class TestcasesService {
   constructor(
     @InjectRepository(Testcase)
     private readonly testcasesRepository: ExtendedRepository<Testcase>,
-    private readonly filesService: FilesService,
+    private readonly filesService: FilesService
   ) {}
 
   getById(id: number, relations: string[] = []): Promise<Testcase> {
     return this.testcasesRepository.findOneOrThrow(
       { where: { id }, relations },
-      new NotFoundException('Testcase not found!'),
+      new NotFoundException('Testcase not found!')
     );
   }
 
diff --git a/server/src/features/users/roles.controller.ts b/projects/server/src/features/users/roles.controller.ts
similarity index 100%
rename from server/src/features/users/roles.controller.ts
rename to projects/server/src/features/users/roles.controller.ts
diff --git a/server/src/features/users/roles.service.ts b/projects/server/src/features/users/roles.service.ts
similarity index 89%
rename from server/src/features/users/roles.service.ts
rename to projects/server/src/features/users/roles.service.ts
index 18e4060..f6af59e 100644
--- a/server/src/features/users/roles.service.ts
+++ b/projects/server/src/features/users/roles.service.ts
@@ -9,7 +9,7 @@ import { Role } from '../../entities';
 export class RolesService {
   constructor(
     @InjectRepository(Role)
-    private readonly rolesRepository: ExtendedRepository<Role>,
+    private readonly rolesRepository: ExtendedRepository<Role>
   ) {}
 
   getAll(): Promise<Role[]> {
diff --git a/server/src/features/users/users.controller.ts b/projects/server/src/features/users/users.controller.ts
similarity index 99%
rename from server/src/features/users/users.controller.ts
rename to projects/server/src/features/users/users.controller.ts
index 290f788..6fb91c4 100644
--- a/server/src/features/users/users.controller.ts
+++ b/projects/server/src/features/users/users.controller.ts
@@ -63,7 +63,7 @@ export class UsersController {
       passport: {
         user: { id: currentId },
       },
-    },
+    }
   ): Promise<void> {
     if (id === currentId) throw new BadRequestException();
     return this.usersService.delete(id);
diff --git a/server/src/features/users/users.module.ts b/projects/server/src/features/users/users.module.ts
similarity index 100%
rename from server/src/features/users/users.module.ts
rename to projects/server/src/features/users/users.module.ts
diff --git a/server/src/features/users/users.service.ts b/projects/server/src/features/users/users.service.ts
similarity index 91%
rename from server/src/features/users/users.service.ts
rename to projects/server/src/features/users/users.service.ts
index 9eafff1..ff3fda0 100644
--- a/server/src/features/users/users.service.ts
+++ b/projects/server/src/features/users/users.service.ts
@@ -10,7 +10,7 @@ import { User } from '../../entities';
 export class UsersService {
   constructor(
     @InjectRepository(User)
-    private readonly usersRepository: ExtendedRepository<User>,
+    private readonly usersRepository: ExtendedRepository<User>
   ) {}
 
   getAll(): Promise<User[]> {
@@ -29,14 +29,14 @@ export class UsersService {
   getById(id: number, relations: string[] = [], select?: (keyof User)[]): Promise<User> {
     return this.usersRepository.findOneOrThrow(
       { where: { id }, relations, select },
-      new NotFoundException('User not found!'),
+      new NotFoundException('User not found!')
     );
   }
 
   getByUsername(username: string, relations: string[] = []): Promise<User> {
     return this.usersRepository.findOneOrThrow(
       { where: { username }, relations },
-      new NotFoundException('User not found!'),
+      new NotFoundException('User not found!')
     );
   }
 
@@ -51,7 +51,7 @@ export class UsersService {
   async create(user: User): Promise<User> {
     user.password = await hash(
       user.password || Math.random().toString(36).substring(2),
-      await genSalt(10),
+      await genSalt(10)
     );
     return this.save(user);
   }
diff --git a/server/src/features/websocket/websocket.gateway.ts b/projects/server/src/features/websocket/websocket.gateway.ts
similarity index 54%
rename from server/src/features/websocket/websocket.gateway.ts
rename to projects/server/src/features/websocket/websocket.gateway.ts
index 85ccf7c..acddad6 100644
--- a/server/src/features/websocket/websocket.gateway.ts
+++ b/projects/server/src/features/websocket/websocket.gateway.ts
@@ -6,9 +6,19 @@ import {
 } from '@nestjs/websockets';
 import { Server, Socket } from 'socket.io';
 import { LogClass } from '../../core/log.decorator';
+import { User } from '../../entities';
 import { JudgeHostsService } from '../judge-hosts/judge-hosts.service';
+import { TeamsService } from '../teams/teams.service';
 
-type UpdateEvents = 'contests' | 'scoreboard' | 'submissions' | 'judgings' | 'judgeRuns';
+type UpdateEvents =
+  | 'contests'
+  | 'scoreboard'
+  | 'submissions'
+  | 'judgings'
+  | 'judgeRuns'
+  | 'clarifications';
+
+type Rooms = 'juries' | 'judgeHosts' | `team-${number}`;
 
 @LogClass
 @WebSocketGateway({ namespace: 'ws' })
@@ -16,19 +26,28 @@ export class WebsocketGateway {
   @WebSocketServer()
   server: Server;
 
-  constructor(private readonly judgeHostsService: JudgeHostsService) {}
+  constructor(
+    private readonly judgeHostsService: JudgeHostsService,
+    private readonly teamsService: TeamsService
+  ) {}
 
-  pingForUpdates(...events: UpdateEvents[]) {
-    events.forEach((event) => this.server.emit(event, true));
+  pingForUpdates(room: Rooms | 'all', ...events: UpdateEvents[]) {
+    events.forEach((event) =>
+      room === 'all' ? this.server.emit(event, true) : this.server.in(room).emit(event, true)
+    );
   }
 
   @SubscribeMessage('subscribe')
-  subscribe(client: Socket) {
-    const roleName = (client.request as any).session?.passport?.user.role.name;
+  async subscribe(client: Socket) {
+    const user: User = (client.request as any).session?.passport?.user;
+    const roleName = user?.role.name;
     if (['admin', 'jury'].includes(roleName)) {
       client.join('juries');
     } else if (roleName === 'judge-host') {
       client.join('judgeHosts');
+    } else if (roleName === 'team') {
+      const team = await this.teamsService.getByUserId(user.id);
+      client.join(`team-${team.id}`);
     }
   }
 
diff --git a/server/src/features/websocket/websocket.module.ts b/projects/server/src/features/websocket/websocket.module.ts
similarity index 71%
rename from server/src/features/websocket/websocket.module.ts
rename to projects/server/src/features/websocket/websocket.module.ts
index e3fb239..3e6e3bb 100644
--- a/server/src/features/websocket/websocket.module.ts
+++ b/projects/server/src/features/websocket/websocket.module.ts
@@ -1,9 +1,10 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { JudgeHostsModule } from '../judge-hosts/judge-hosts.module';
+import { TeamsModule } from '../teams/teams.module';
 import { WebsocketGateway } from './websocket.gateway';
 
 @Module({
-  imports: [forwardRef(() => JudgeHostsModule)],
+  imports: [forwardRef(() => JudgeHostsModule), TeamsModule],
   providers: [WebsocketGateway],
   exports: [WebsocketGateway],
 })
diff --git a/server/src/guards/authenticated.guard.ts b/projects/server/src/guards/authenticated.guard.ts
similarity index 100%
rename from server/src/guards/authenticated.guard.ts
rename to projects/server/src/guards/authenticated.guard.ts
diff --git a/server/src/guards/index.ts b/projects/server/src/guards/index.ts
similarity index 100%
rename from server/src/guards/index.ts
rename to projects/server/src/guards/index.ts
diff --git a/server/src/guards/login.guard.ts b/projects/server/src/guards/login.guard.ts
similarity index 97%
rename from server/src/guards/login.guard.ts
rename to projects/server/src/guards/login.guard.ts
index 84fc1fb..8f31923 100644
--- a/server/src/guards/login.guard.ts
+++ b/projects/server/src/guards/login.guard.ts
@@ -16,7 +16,7 @@ export class LoginGuard extends AuthGuard('local') {
     const user = await this.usersService.getById(
       request.session.passport.user.id,
       [],
-      ['id', 'sessionId'],
+      ['id', 'sessionId']
     );
     if (user) store.destroy(user.sessionId);
     await this.usersService.update(request.session.passport.user.id, {
diff --git a/server/src/guards/roles.guard.ts b/projects/server/src/guards/roles.guard.ts
similarity index 100%
rename from server/src/guards/roles.guard.ts
rename to projects/server/src/guards/roles.guard.ts
diff --git a/server/src/main.ts b/projects/server/src/main.ts
similarity index 96%
rename from server/src/main.ts
rename to projects/server/src/main.ts
index 41c9dfe..21a34af 100644
--- a/server/src/main.ts
+++ b/projects/server/src/main.ts
@@ -22,7 +22,7 @@ async function bootstrap() {
   const app = await NestFactory.create(AppModule, {
     logger: ['error', 'warn', 'log', 'debug', 'verbose'].slice(
       0,
-      (logLevelRanks[config.logLevel ?? 'log'] ?? 2) + 1,
+      (logLevelRanks[config.logLevel ?? 'log'] ?? 2) + 1
     ) as LogLevel[],
   });
   if (config.nodeEnv === 'development') {
@@ -54,7 +54,7 @@ async function bootstrap() {
       swaggerSpec: document,
       authentication: true,
       onAuthenticate: (req: any) => req.session.passport?.user.role.name === 'admin',
-    }),
+    })
   );
 
   await app.listen(3000, '0.0.0.0');
diff --git a/judge/test/app.e2e-spec.ts b/projects/server/test/app.e2e-spec.ts
similarity index 83%
rename from judge/test/app.e2e-spec.ts
rename to projects/server/test/app.e2e-spec.ts
index 50cda62..5f1aedc 100644
--- a/judge/test/app.e2e-spec.ts
+++ b/projects/server/test/app.e2e-spec.ts
@@ -1,5 +1,5 @@
-import { Test, TestingModule } from '@nestjs/testing';
 import { INestApplication } from '@nestjs/common';
+import { Test, TestingModule } from '@nestjs/testing';
 import * as request from 'supertest';
 import { AppModule } from './../src/app.module';
 
@@ -16,9 +16,6 @@ describe('AppController (e2e)', () => {
   });
 
   it('/ (GET)', () => {
-    return request(app.getHttpServer())
-      .get('/')
-      .expect(200)
-      .expect('Hello World!');
+    return request(app.getHttpServer()).get('/').expect(200).expect('Hello World!');
   });
 });
diff --git a/server/test/jest-e2e.json b/projects/server/test/jest-e2e.json
similarity index 100%
rename from server/test/jest-e2e.json
rename to projects/server/test/jest-e2e.json
diff --git a/server/tsconfig.build.json b/projects/server/tsconfig.build.json
similarity index 100%
rename from server/tsconfig.build.json
rename to projects/server/tsconfig.build.json
diff --git a/server/tsconfig.json b/projects/server/tsconfig.json
similarity index 100%
rename from server/tsconfig.json
rename to projects/server/tsconfig.json
diff --git a/server/yarn.lock b/projects/server/yarn.lock
similarity index 99%
rename from server/yarn.lock
rename to projects/server/yarn.lock
index 8a9a488..4dcd965 100644
--- a/server/yarn.lock
+++ b/projects/server/yarn.lock
@@ -5100,16 +5100,6 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier-plugin-organize-imports@^2.3.4:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-2.3.4.tgz#65473861ae5ab7960439fff270a2258558fbe9ba"
-  integrity sha512-R8o23sf5iVL/U71h9SFUdhdOEPsi3nm42FD/oDYIZ2PQa4TNWWuWecxln6jlIQzpZTDMUeO1NicJP6lLn2TtRw==
-
-prettier@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
-  integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==
-
 pretty-format@^27.0.0, pretty-format@^27.2.4:
   version "27.2.4"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.2.4.tgz#08ea39c5eab41b082852d7093059a091f6ddc748"
diff --git a/server/.prettierrc b/server/.prettierrc
deleted file mode 100644
index 2fec1f2..0000000
--- a/server/.prettierrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all",
-  "printWidth": 100
-}
diff --git a/yarn.lock b/yarn.lock
index 17c8f0f..b67b907 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
 "@babel/code-frame@^7.0.0":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
@@ -14,7 +21,7 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8"
   integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==
 
-"@babel/highlight@^7.14.5":
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
   integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
@@ -160,11 +167,66 @@
   dependencies:
     chalk "^4.0.0"
 
+"@eslint/eslintrc@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
+  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.1.1"
+    espree "^7.3.0"
+    globals "^13.9.0"
+    ignore "^4.0.6"
+    import-fresh "^3.2.1"
+    js-yaml "^3.13.1"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
+
+"@humanwhocodes/config-array@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
+  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.0"
+    debug "^4.1.1"
+    minimatch "^3.0.4"
+
+"@humanwhocodes/object-schema@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
+  integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
+
 "@hutson/parse-repository-url@^3.0.0":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
   integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==
 
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
+"@types/json-schema@^7.0.7":
+  version "7.0.9"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
+  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
+
 "@types/minimist@^1.2.0":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
@@ -180,6 +242,76 @@
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
+"@typescript-eslint/eslint-plugin@^4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276"
+  integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "4.33.0"
+    "@typescript-eslint/scope-manager" "4.33.0"
+    debug "^4.3.1"
+    functional-red-black-tree "^1.0.1"
+    ignore "^5.1.8"
+    regexpp "^3.1.0"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/experimental-utils@4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd"
+  integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==
+  dependencies:
+    "@types/json-schema" "^7.0.7"
+    "@typescript-eslint/scope-manager" "4.33.0"
+    "@typescript-eslint/types" "4.33.0"
+    "@typescript-eslint/typescript-estree" "4.33.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+
+"@typescript-eslint/parser@^4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899"
+  integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==
+  dependencies:
+    "@typescript-eslint/scope-manager" "4.33.0"
+    "@typescript-eslint/types" "4.33.0"
+    "@typescript-eslint/typescript-estree" "4.33.0"
+    debug "^4.3.1"
+
+"@typescript-eslint/scope-manager@4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3"
+  integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==
+  dependencies:
+    "@typescript-eslint/types" "4.33.0"
+    "@typescript-eslint/visitor-keys" "4.33.0"
+
+"@typescript-eslint/types@4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
+  integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==
+
+"@typescript-eslint/typescript-estree@4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
+  integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==
+  dependencies:
+    "@typescript-eslint/types" "4.33.0"
+    "@typescript-eslint/visitor-keys" "4.33.0"
+    debug "^4.3.1"
+    globby "^11.0.3"
+    is-glob "^4.0.1"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/visitor-keys@4.33.0":
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
+  integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==
+  dependencies:
+    "@typescript-eslint/types" "4.33.0"
+    eslint-visitor-keys "^2.0.0"
+
 JSONStream@^1.0.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -188,12 +320,47 @@ JSONStream@^1.0.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
+acorn-jsx@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+
+acorn@^7.4.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+
 add-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
   integrity sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=
 
-ansi-regex@^5.0.0:
+ajv@^6.10.0, ajv@^6.12.4:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@^8.0.1:
+  version "8.6.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
+  integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-regex@^5.0.0, ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -212,16 +379,33 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
 array-ify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
   integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
@@ -240,6 +424,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -526,6 +717,15 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
+cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 dargs@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc"
@@ -536,6 +736,13 @@ dateformat@^3.0.0:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
+debug@^4.0.1, debug@^4.1.1, debug@^4.3.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
 decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -549,6 +756,11 @@ decamelize@^1.1.0, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
+deep-is@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+
 detect-indent@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
@@ -559,6 +771,20 @@ detect-newline@^3.1.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
 dot-prop@^5.1.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -579,6 +805,13 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+enquirer@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -596,6 +829,165 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
+eslint-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
+eslint-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
+  dependencies:
+    eslint-visitor-keys "^2.0.0"
+
+eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
+
+eslint-visitor-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+
+eslint@^7.32.0:
+  version "7.32.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
+  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+  dependencies:
+    "@babel/code-frame" "7.12.11"
+    "@eslint/eslintrc" "^0.4.3"
+    "@humanwhocodes/config-array" "^0.5.0"
+    ajv "^6.10.0"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    enquirer "^2.3.5"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^2.1.0"
+    eslint-visitor-keys "^2.0.0"
+    espree "^7.3.1"
+    esquery "^1.4.0"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^5.1.2"
+    globals "^13.6.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.0.4"
+    natural-compare "^1.4.0"
+    optionator "^0.9.1"
+    progress "^2.0.0"
+    regexpp "^3.1.0"
+    semver "^7.2.1"
+    strip-ansi "^6.0.0"
+    strip-json-comments "^3.1.0"
+    table "^6.0.9"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
+espree@^7.3.0, espree@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+  dependencies:
+    acorn "^7.4.0"
+    acorn-jsx "^5.3.1"
+    eslint-visitor-keys "^1.3.0"
+
+esprima@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esquery@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-glob@^3.1.1:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
+  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fastq@^1.6.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+  dependencies:
+    reusify "^1.0.4"
+
 figures@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@@ -603,6 +995,20 @@ figures@^3.1.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+  dependencies:
+    flat-cache "^3.0.4"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -633,6 +1039,19 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  dependencies:
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
+
+flatted@^3.1.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561"
+  integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==
+
 fs-access@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
@@ -650,11 +1069,21 @@ fs-extra@^9.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -704,6 +1133,25 @@ gitconfiglocal@^1.0.0:
   dependencies:
     ini "^1.3.2"
 
+glob-parent@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@^7.1.3:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-dirs@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
@@ -711,6 +1159,25 @@ global-dirs@^0.1.1:
   dependencies:
     ini "^1.3.4"
 
+globals@^13.6.0, globals@^13.9.0:
+  version "13.11.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7"
+  integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==
+  dependencies:
+    type-fest "^0.20.2"
+
+globby@^11.0.3:
+  version "11.0.4"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
+  integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
 graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
@@ -767,6 +1234,16 @@ husky@^6.0.0:
   resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e"
   integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==
 
+ignore@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
+ignore@^5.1.4, ignore@^5.1.8:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -775,12 +1252,25 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
 indent-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-inherits@^2.0.3, inherits@~2.0.3:
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -802,11 +1292,28 @@ is-core-module@^2.2.0:
   dependencies:
     has "^1.0.3"
 
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-glob@^4.0.0, is-glob@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 is-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
@@ -829,11 +1336,24 @@ isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -844,6 +1364,21 @@ json-parse-even-better-errors@^2.3.0:
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
 json-stringify-safe@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -868,6 +1403,14 @@ kind-of@^6.0.3:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -913,11 +1456,26 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
 lodash.ismatch@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
 
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash.truncate@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
+  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
+
 lodash@^4.17.15, lodash@^4.17.19:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -974,6 +1532,19 @@ meow@^8.0.0:
     type-fest "^0.18.0"
     yargs-parser "^20.2.3"
 
+merge2@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.2.3"
+
 min-indent@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
@@ -1005,6 +1576,16 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+
 neo-async@^2.6.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
@@ -1035,6 +1616,25 @@ null-check@^1.0.0:
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
   integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=
 
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
+
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -1129,6 +1729,16 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
 path-parse@^1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -1146,6 +1756,11 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+picomatch@^2.2.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+
 pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -1156,16 +1771,46 @@ pify@^3.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
+prettier-plugin-organize-imports@^2.3.4:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-2.3.4.tgz#65473861ae5ab7960439fff270a2258558fbe9ba"
+  integrity sha512-R8o23sf5iVL/U71h9SFUdhdOEPsi3nm42FD/oDYIZ2PQa4TNWWuWecxln6jlIQzpZTDMUeO1NicJP6lLn2TtRw==
+
+prettier@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
+  integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==
+
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
+progress@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
 q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
 quick-lru@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
@@ -1237,11 +1882,21 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
+regexpp@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
 resolve-from@5.0.0, resolve-from@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
@@ -1267,6 +1922,18 @@ resolve@^1.10.0, resolve@^1.20.0:
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 run-in-all@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-in-all/-/run-in-all-1.2.0.tgz#b59ab9619702948fac46210854354d048063ec7d"
@@ -1275,6 +1942,13 @@ run-in-all@1.2.0:
     chalk "^4.1.0"
     yargs "^16.2.0"
 
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -1290,7 +1964,7 @@ safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.3.5, semver@^7.1.1, semver@^7.3.4:
+semver@7.3.5, semver@^7.1.1, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -1302,6 +1976,32 @@ semver@^6.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
 source-map@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -1347,6 +2047,11 @@ split@^1.0.0:
   dependencies:
     through "2"
 
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
 standard-version@^9.3.1:
   version "9.3.1"
   resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-9.3.1.tgz#786c16c318847f58a31a2434f97e8db33a635853"
@@ -1377,6 +2082,15 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
+string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -1403,6 +2117,13 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -1415,6 +2136,11 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -1429,11 +2155,28 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
+table@^6.0.9:
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0"
+  integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==
+  dependencies:
+    ajv "^8.0.1"
+    lodash.clonedeep "^4.5.0"
+    lodash.truncate "^4.4.2"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+
 text-extensions@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
   integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -1454,6 +2197,13 @@ through@2, "through@>=2.2.7 <3":
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -1464,6 +2214,25 @@ trim-off-newlines@^1.0.0:
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.2.tgz#65d52e4f4115992c0dac87220bdcc279fe58c422"
   integrity sha512-DAnbtY4lNoOTLw05HLuvPoBFAGV4zOKQ9d1Q45JB+bcDwYIEkCr0xNgwKtygtKFBbRlFA/8ytkAM1V09QGWksg==
 
+tslib@^1.8.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tsutils@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
+
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
 type-fest@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
@@ -1474,6 +2243,11 @@ type-fest@^0.18.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
   integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
 
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
 type-fest@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
@@ -1489,6 +2263,11 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript@^4.4.3:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
+  integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==
+
 uglify-js@^3.1.4:
   version "3.13.10"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.10.tgz#a6bd0d28d38f592c3adb6b180ea6e07e1e540a8d"
@@ -1499,11 +2278,23 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
+v8-compile-cache@^2.0.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -1512,6 +2303,18 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+word-wrap@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
 wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -1526,6 +2329,11 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
 xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"