diff --git a/.gitmodules b/.gitmodules
index 2052a51..51e0448 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "web/src/cascade"]
-	path = web/src/cascade
+	path = app/web/src/cascade
 	url = https://github.com/Irev-Dev/CascadeStudio.git
diff --git a/.env.defaults b/app/.env.defaults
similarity index 100%
rename from .env.defaults
rename to app/.env.defaults
diff --git a/.env.example b/app/.env.example
similarity index 100%
rename from .env.example
rename to app/.env.example
diff --git a/.eslintignore b/app/.eslintignore
similarity index 100%
rename from .eslintignore
rename to app/.eslintignore
diff --git a/.nvmrc b/app/.nvmrc
similarity index 100%
rename from .nvmrc
rename to app/.nvmrc
diff --git a/api/.babelrc.js b/app/api/.babelrc.js
similarity index 100%
rename from api/.babelrc.js
rename to app/api/.babelrc.js
diff --git a/api/db/migrations/20210228081443_initial_migration_to_postgres_from_sqlite/migration.sql b/app/api/db/migrations/20210228081443_initial_migration_to_postgres_from_sqlite/migration.sql
similarity index 100%
rename from api/db/migrations/20210228081443_initial_migration_to_postgres_from_sqlite/migration.sql
rename to app/api/db/migrations/20210228081443_initial_migration_to_postgres_from_sqlite/migration.sql
diff --git a/api/db/migrations/migration_lock.toml b/app/api/db/migrations/migration_lock.toml
similarity index 100%
rename from api/db/migrations/migration_lock.toml
rename to app/api/db/migrations/migration_lock.toml
diff --git a/api/db/schema.prisma b/app/api/db/schema.prisma
similarity index 100%
rename from api/db/schema.prisma
rename to app/api/db/schema.prisma
diff --git a/api/db/seed.js b/app/api/db/seed.js
similarity index 100%
rename from api/db/seed.js
rename to app/api/db/seed.js
diff --git a/api/jest.config.js b/app/api/jest.config.js
similarity index 100%
rename from api/jest.config.js
rename to app/api/jest.config.js
diff --git a/api/jsconfig.json b/app/api/jsconfig.json
similarity index 100%
rename from api/jsconfig.json
rename to app/api/jsconfig.json
diff --git a/api/package.json b/app/api/package.json
similarity index 100%
rename from api/package.json
rename to app/api/package.json
diff --git a/api/src/docker/Dockerfile b/app/api/src/docker/Dockerfile
similarity index 100%
rename from api/src/docker/Dockerfile
rename to app/api/src/docker/Dockerfile
diff --git a/api/src/docker/README.md b/app/api/src/docker/README.md
similarity index 100%
rename from api/src/docker/README.md
rename to app/api/src/docker/README.md
diff --git a/api/src/docker/aws-emulator.js b/app/api/src/docker/aws-emulator.js
similarity index 100%
rename from api/src/docker/aws-emulator.js
rename to app/api/src/docker/aws-emulator.js
diff --git a/api/src/docker/cadquery/Dockerfile b/app/api/src/docker/cadquery/Dockerfile
similarity index 100%
rename from api/src/docker/cadquery/Dockerfile
rename to app/api/src/docker/cadquery/Dockerfile
diff --git a/api/src/docker/cadquery/cadquery.js b/app/api/src/docker/cadquery/cadquery.js
similarity index 100%
rename from api/src/docker/cadquery/cadquery.js
rename to app/api/src/docker/cadquery/cadquery.js
diff --git a/api/src/docker/cadquery/package.json b/app/api/src/docker/cadquery/package.json
similarity index 100%
rename from api/src/docker/cadquery/package.json
rename to app/api/src/docker/cadquery/package.json
diff --git a/api/src/docker/cadquery/runCQ.js b/app/api/src/docker/cadquery/runCQ.js
similarity index 100%
rename from api/src/docker/cadquery/runCQ.js
rename to app/api/src/docker/cadquery/runCQ.js
diff --git a/api/src/docker/cadquery/yarn.lock b/app/api/src/docker/cadquery/yarn.lock
similarity index 100%
rename from api/src/docker/cadquery/yarn.lock
rename to app/api/src/docker/cadquery/yarn.lock
diff --git a/api/src/docker/common/entrypoint.sh b/app/api/src/docker/common/entrypoint.sh
similarity index 100%
rename from api/src/docker/common/entrypoint.sh
rename to app/api/src/docker/common/entrypoint.sh
diff --git a/api/src/docker/common/node14source_setup.sh b/app/api/src/docker/common/node14source_setup.sh
similarity index 100%
rename from api/src/docker/common/node14source_setup.sh
rename to app/api/src/docker/common/node14source_setup.sh
diff --git a/api/src/docker/common/utils.js b/app/api/src/docker/common/utils.js
similarity index 100%
rename from api/src/docker/common/utils.js
rename to app/api/src/docker/common/utils.js
diff --git a/api/src/docker/docker-compose.yml b/app/api/src/docker/docker-compose.yml
similarity index 100%
rename from api/src/docker/docker-compose.yml
rename to app/api/src/docker/docker-compose.yml
diff --git a/api/src/docker/openscad/Dockerfile b/app/api/src/docker/openscad/Dockerfile
similarity index 100%
rename from api/src/docker/openscad/Dockerfile
rename to app/api/src/docker/openscad/Dockerfile
diff --git a/api/src/docker/openscad/openscad.js b/app/api/src/docker/openscad/openscad.js
similarity index 100%
rename from api/src/docker/openscad/openscad.js
rename to app/api/src/docker/openscad/openscad.js
diff --git a/api/src/docker/openscad/package.json b/app/api/src/docker/openscad/package.json
similarity index 100%
rename from api/src/docker/openscad/package.json
rename to app/api/src/docker/openscad/package.json
diff --git a/api/src/docker/openscad/runScad.js b/app/api/src/docker/openscad/runScad.js
similarity index 100%
rename from api/src/docker/openscad/runScad.js
rename to app/api/src/docker/openscad/runScad.js
diff --git a/api/src/docker/openscad/yarn.lock b/app/api/src/docker/openscad/yarn.lock
similarity index 100%
rename from api/src/docker/openscad/yarn.lock
rename to app/api/src/docker/openscad/yarn.lock
diff --git a/api/src/docker/package.json b/app/api/src/docker/package.json
similarity index 100%
rename from api/src/docker/package.json
rename to app/api/src/docker/package.json
diff --git a/api/src/docker/serverless.yml b/app/api/src/docker/serverless.yml
similarity index 100%
rename from api/src/docker/serverless.yml
rename to app/api/src/docker/serverless.yml
diff --git a/api/src/docker/yarn.lock b/app/api/src/docker/yarn.lock
similarity index 100%
rename from api/src/docker/yarn.lock
rename to app/api/src/docker/yarn.lock
diff --git a/api/src/functions/graphql.js b/app/api/src/functions/graphql.js
similarity index 100%
rename from api/src/functions/graphql.js
rename to app/api/src/functions/graphql.js
diff --git a/api/src/functions/identity-signup.js b/app/api/src/functions/identity-signup.js
similarity index 100%
rename from api/src/functions/identity-signup.js
rename to app/api/src/functions/identity-signup.js
diff --git a/api/src/graphql/.keep b/app/api/src/graphql/.keep
similarity index 100%
rename from api/src/graphql/.keep
rename to app/api/src/graphql/.keep
diff --git a/api/src/graphql/comments.sdl.js b/app/api/src/graphql/comments.sdl.js
similarity index 100%
rename from api/src/graphql/comments.sdl.js
rename to app/api/src/graphql/comments.sdl.js
diff --git a/api/src/graphql/partReactions.sdl.js b/app/api/src/graphql/partReactions.sdl.js
similarity index 100%
rename from api/src/graphql/partReactions.sdl.js
rename to app/api/src/graphql/partReactions.sdl.js
diff --git a/api/src/graphql/parts.sdl.js b/app/api/src/graphql/parts.sdl.js
similarity index 100%
rename from api/src/graphql/parts.sdl.js
rename to app/api/src/graphql/parts.sdl.js
diff --git a/api/src/graphql/subjectAccessRequests.sdl.js b/app/api/src/graphql/subjectAccessRequests.sdl.js
similarity index 100%
rename from api/src/graphql/subjectAccessRequests.sdl.js
rename to app/api/src/graphql/subjectAccessRequests.sdl.js
diff --git a/api/src/graphql/users.sdl.js b/app/api/src/graphql/users.sdl.js
similarity index 100%
rename from api/src/graphql/users.sdl.js
rename to app/api/src/graphql/users.sdl.js
diff --git a/api/src/lib/auth.js b/app/api/src/lib/auth.js
similarity index 100%
rename from api/src/lib/auth.js
rename to app/api/src/lib/auth.js
diff --git a/api/src/lib/db.js b/app/api/src/lib/db.js
similarity index 100%
rename from api/src/lib/db.js
rename to app/api/src/lib/db.js
diff --git a/api/src/lib/logger.ts b/app/api/src/lib/logger.ts
similarity index 100%
rename from api/src/lib/logger.ts
rename to app/api/src/lib/logger.ts
diff --git a/api/src/lib/owner.js b/app/api/src/lib/owner.js
similarity index 100%
rename from api/src/lib/owner.js
rename to app/api/src/lib/owner.js
diff --git a/api/src/services/.keep b/app/api/src/services/.keep
similarity index 100%
rename from api/src/services/.keep
rename to app/api/src/services/.keep
diff --git a/api/src/services/comments/comments.js b/app/api/src/services/comments/comments.js
similarity index 100%
rename from api/src/services/comments/comments.js
rename to app/api/src/services/comments/comments.js
diff --git a/api/src/services/comments/comments.test.js b/app/api/src/services/comments/comments.test.js
similarity index 100%
rename from api/src/services/comments/comments.test.js
rename to app/api/src/services/comments/comments.test.js
diff --git a/api/src/services/helpers.js b/app/api/src/services/helpers.js
similarity index 100%
rename from api/src/services/helpers.js
rename to app/api/src/services/helpers.js
diff --git a/api/src/services/partReactions/partReactions.js b/app/api/src/services/partReactions/partReactions.js
similarity index 100%
rename from api/src/services/partReactions/partReactions.js
rename to app/api/src/services/partReactions/partReactions.js
diff --git a/api/src/services/partReactions/partReactions.test.js b/app/api/src/services/partReactions/partReactions.test.js
similarity index 100%
rename from api/src/services/partReactions/partReactions.test.js
rename to app/api/src/services/partReactions/partReactions.test.js
diff --git a/api/src/services/parts/parts.js b/app/api/src/services/parts/parts.js
similarity index 100%
rename from api/src/services/parts/parts.js
rename to app/api/src/services/parts/parts.js
diff --git a/api/src/services/parts/parts.test.js b/app/api/src/services/parts/parts.test.js
similarity index 100%
rename from api/src/services/parts/parts.test.js
rename to app/api/src/services/parts/parts.test.js
diff --git a/api/src/services/subjectAccessRequests/subjectAccessRequests.js b/app/api/src/services/subjectAccessRequests/subjectAccessRequests.js
similarity index 100%
rename from api/src/services/subjectAccessRequests/subjectAccessRequests.js
rename to app/api/src/services/subjectAccessRequests/subjectAccessRequests.js
diff --git a/api/src/services/subjectAccessRequests/subjectAccessRequests.test.js b/app/api/src/services/subjectAccessRequests/subjectAccessRequests.test.js
similarity index 100%
rename from api/src/services/subjectAccessRequests/subjectAccessRequests.test.js
rename to app/api/src/services/subjectAccessRequests/subjectAccessRequests.test.js
diff --git a/api/src/services/users/users.js b/app/api/src/services/users/users.js
similarity index 100%
rename from api/src/services/users/users.js
rename to app/api/src/services/users/users.js
diff --git a/api/src/services/users/users.test.js b/app/api/src/services/users/users.test.js
similarity index 100%
rename from api/src/services/users/users.test.js
rename to app/api/src/services/users/users.test.js
diff --git a/babel.config.js b/app/babel.config.js
similarity index 100%
rename from babel.config.js
rename to app/babel.config.js
diff --git a/graphql.config.js b/app/graphql.config.js
similarity index 100%
rename from graphql.config.js
rename to app/graphql.config.js
diff --git a/netlify.toml b/app/netlify.toml
similarity index 100%
rename from netlify.toml
rename to app/netlify.toml
diff --git a/package.json b/app/package.json
similarity index 100%
rename from package.json
rename to app/package.json
diff --git a/prettier.config.js b/app/prettier.config.js
similarity index 100%
rename from prettier.config.js
rename to app/prettier.config.js
diff --git a/redwood.toml b/app/redwood.toml
similarity index 100%
rename from redwood.toml
rename to app/redwood.toml
diff --git a/web/.babelrc.js b/app/web/.babelrc.js
similarity index 100%
rename from web/.babelrc.js
rename to app/web/.babelrc.js
diff --git a/web/config/postcss.config.js b/app/web/config/postcss.config.js
similarity index 100%
rename from web/config/postcss.config.js
rename to app/web/config/postcss.config.js
diff --git a/web/config/webpack.config.js b/app/web/config/webpack.config.js
similarity index 100%
rename from web/config/webpack.config.js
rename to app/web/config/webpack.config.js
diff --git a/web/identity-test.json b/app/web/identity-test.json
similarity index 100%
rename from web/identity-test.json
rename to app/web/identity-test.json
diff --git a/web/jest.config.js b/app/web/jest.config.js
similarity index 100%
rename from web/jest.config.js
rename to app/web/jest.config.js
diff --git a/web/jsconfig.json b/app/web/jsconfig.json
similarity index 100%
rename from web/jsconfig.json
rename to app/web/jsconfig.json
diff --git a/web/package.json b/app/web/package.json
similarity index 100%
rename from web/package.json
rename to app/web/package.json
diff --git a/web/public/README.md b/app/web/public/README.md
similarity index 100%
rename from web/public/README.md
rename to app/web/public/README.md
diff --git a/web/public/robots.txt b/app/web/public/robots.txt
similarity index 100%
rename from web/public/robots.txt
rename to app/web/public/robots.txt
diff --git a/web/src/App.js b/app/web/src/App.js
similarity index 100%
rename from web/src/App.js
rename to app/web/src/App.js
diff --git a/web/src/Routes.js b/app/web/src/Routes.js
similarity index 100%
rename from web/src/Routes.js
rename to app/web/src/Routes.js
diff --git a/web/src/cascade b/app/web/src/cascade
similarity index 100%
rename from web/src/cascade
rename to app/web/src/cascade
diff --git a/web/src/components/.keep b/app/web/src/components/.keep
similarity index 100%
rename from web/src/components/.keep
rename to app/web/src/components/.keep
diff --git a/web/src/components/AdminParts/AdminParts.js b/app/web/src/components/AdminParts/AdminParts.js
similarity index 100%
rename from web/src/components/AdminParts/AdminParts.js
rename to app/web/src/components/AdminParts/AdminParts.js
diff --git a/web/src/components/AdminPartsCell/AdminPartsCell.js b/app/web/src/components/AdminPartsCell/AdminPartsCell.js
similarity index 100%
rename from web/src/components/AdminPartsCell/AdminPartsCell.js
rename to app/web/src/components/AdminPartsCell/AdminPartsCell.js
diff --git a/web/src/components/Breadcrumb/Breadcrumb.js b/app/web/src/components/Breadcrumb/Breadcrumb.js
similarity index 100%
rename from web/src/components/Breadcrumb/Breadcrumb.js
rename to app/web/src/components/Breadcrumb/Breadcrumb.js
diff --git a/web/src/components/Breadcrumb/Breadcrumb.stories.js b/app/web/src/components/Breadcrumb/Breadcrumb.stories.js
similarity index 100%
rename from web/src/components/Breadcrumb/Breadcrumb.stories.js
rename to app/web/src/components/Breadcrumb/Breadcrumb.stories.js
diff --git a/web/src/components/Breadcrumb/Breadcrumb.test.js b/app/web/src/components/Breadcrumb/Breadcrumb.test.js
similarity index 100%
rename from web/src/components/Breadcrumb/Breadcrumb.test.js
rename to app/web/src/components/Breadcrumb/Breadcrumb.test.js
diff --git a/web/src/components/Button/Button.js b/app/web/src/components/Button/Button.js
similarity index 100%
rename from web/src/components/Button/Button.js
rename to app/web/src/components/Button/Button.js
diff --git a/web/src/components/Button/Button.stories.js b/app/web/src/components/Button/Button.stories.js
similarity index 100%
rename from web/src/components/Button/Button.stories.js
rename to app/web/src/components/Button/Button.stories.js
diff --git a/web/src/components/Button/Button.test.js b/app/web/src/components/Button/Button.test.js
similarity index 100%
rename from web/src/components/Button/Button.test.js
rename to app/web/src/components/Button/Button.test.js
diff --git a/web/src/components/ConfirmDialog/ConfirmDialog.js b/app/web/src/components/ConfirmDialog/ConfirmDialog.js
similarity index 100%
rename from web/src/components/ConfirmDialog/ConfirmDialog.js
rename to app/web/src/components/ConfirmDialog/ConfirmDialog.js
diff --git a/web/src/components/ConfirmDialog/ConfirmDialog.stories.js b/app/web/src/components/ConfirmDialog/ConfirmDialog.stories.js
similarity index 100%
rename from web/src/components/ConfirmDialog/ConfirmDialog.stories.js
rename to app/web/src/components/ConfirmDialog/ConfirmDialog.stories.js
diff --git a/web/src/components/ConfirmDialog/ConfirmDialog.test.js b/app/web/src/components/ConfirmDialog/ConfirmDialog.test.js
similarity index 100%
rename from web/src/components/ConfirmDialog/ConfirmDialog.test.js
rename to app/web/src/components/ConfirmDialog/ConfirmDialog.test.js
diff --git a/web/src/components/EditSubjectAccessRequestCell/EditSubjectAccessRequestCell.js b/app/web/src/components/EditSubjectAccessRequestCell/EditSubjectAccessRequestCell.js
similarity index 100%
rename from web/src/components/EditSubjectAccessRequestCell/EditSubjectAccessRequestCell.js
rename to app/web/src/components/EditSubjectAccessRequestCell/EditSubjectAccessRequestCell.js
diff --git a/web/src/components/EditUserCell/EditUserCell.js b/app/web/src/components/EditUserCell/EditUserCell.js
similarity index 100%
rename from web/src/components/EditUserCell/EditUserCell.js
rename to app/web/src/components/EditUserCell/EditUserCell.js
diff --git a/web/src/components/EditUserCell/EditUserCell.mock.js b/app/web/src/components/EditUserCell/EditUserCell.mock.js
similarity index 100%
rename from web/src/components/EditUserCell/EditUserCell.mock.js
rename to app/web/src/components/EditUserCell/EditUserCell.mock.js
diff --git a/web/src/components/EditUserCell/EditUserCell.stories.js b/app/web/src/components/EditUserCell/EditUserCell.stories.js
similarity index 100%
rename from web/src/components/EditUserCell/EditUserCell.stories.js
rename to app/web/src/components/EditUserCell/EditUserCell.stories.js
diff --git a/web/src/components/EditUserCell/EditUserCell.test.js b/app/web/src/components/EditUserCell/EditUserCell.test.js
similarity index 100%
rename from web/src/components/EditUserCell/EditUserCell.test.js
rename to app/web/src/components/EditUserCell/EditUserCell.test.js
diff --git a/web/src/components/EmojiReaction/EmojiReaction.js b/app/web/src/components/EmojiReaction/EmojiReaction.js
similarity index 100%
rename from web/src/components/EmojiReaction/EmojiReaction.js
rename to app/web/src/components/EmojiReaction/EmojiReaction.js
diff --git a/web/src/components/EmojiReaction/EmojiReaction.stories.js b/app/web/src/components/EmojiReaction/EmojiReaction.stories.js
similarity index 100%
rename from web/src/components/EmojiReaction/EmojiReaction.stories.js
rename to app/web/src/components/EmojiReaction/EmojiReaction.stories.js
diff --git a/web/src/components/EmojiReaction/EmojiReaction.test.js b/app/web/src/components/EmojiReaction/EmojiReaction.test.js
similarity index 100%
rename from web/src/components/EmojiReaction/EmojiReaction.test.js
rename to app/web/src/components/EmojiReaction/EmojiReaction.test.js
diff --git a/web/src/components/Footer/Footer.js b/app/web/src/components/Footer/Footer.js
similarity index 100%
rename from web/src/components/Footer/Footer.js
rename to app/web/src/components/Footer/Footer.js
diff --git a/web/src/components/Footer/Footer.stories.js b/app/web/src/components/Footer/Footer.stories.js
similarity index 100%
rename from web/src/components/Footer/Footer.stories.js
rename to app/web/src/components/Footer/Footer.stories.js
diff --git a/web/src/components/Footer/Footer.test.js b/app/web/src/components/Footer/Footer.test.js
similarity index 100%
rename from web/src/components/Footer/Footer.test.js
rename to app/web/src/components/Footer/Footer.test.js
diff --git a/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js b/app/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js
similarity index 100%
rename from web/src/components/IdeCascadeStudio/IdeCascadeStudio.js
rename to app/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js
diff --git a/web/src/components/IdeCascadeStudio/IdeCascadeStudio.stories.js b/app/web/src/components/IdeCascadeStudio/IdeCascadeStudio.stories.js
similarity index 100%
rename from web/src/components/IdeCascadeStudio/IdeCascadeStudio.stories.js
rename to app/web/src/components/IdeCascadeStudio/IdeCascadeStudio.stories.js
diff --git a/web/src/components/IdeCascadeStudio/IdeCascadeStudio.test.js b/app/web/src/components/IdeCascadeStudio/IdeCascadeStudio.test.js
similarity index 100%
rename from web/src/components/IdeCascadeStudio/IdeCascadeStudio.test.js
rename to app/web/src/components/IdeCascadeStudio/IdeCascadeStudio.test.js
diff --git a/web/src/components/IdeConsole/IdeConsole.js b/app/web/src/components/IdeConsole/IdeConsole.js
similarity index 100%
rename from web/src/components/IdeConsole/IdeConsole.js
rename to app/web/src/components/IdeConsole/IdeConsole.js
diff --git a/web/src/components/IdeContainer/IdeContainer.js b/app/web/src/components/IdeContainer/IdeContainer.js
similarity index 100%
rename from web/src/components/IdeContainer/IdeContainer.js
rename to app/web/src/components/IdeContainer/IdeContainer.js
diff --git a/web/src/components/IdeEditor/IdeEditor.js b/app/web/src/components/IdeEditor/IdeEditor.js
similarity index 100%
rename from web/src/components/IdeEditor/IdeEditor.js
rename to app/web/src/components/IdeEditor/IdeEditor.js
diff --git a/web/src/components/IdePartCell/IdePartCell.js b/app/web/src/components/IdePartCell/IdePartCell.js
similarity index 100%
rename from web/src/components/IdePartCell/IdePartCell.js
rename to app/web/src/components/IdePartCell/IdePartCell.js
diff --git a/web/src/components/IdePartCell/IdePartCell.mock.js b/app/web/src/components/IdePartCell/IdePartCell.mock.js
similarity index 100%
rename from web/src/components/IdePartCell/IdePartCell.mock.js
rename to app/web/src/components/IdePartCell/IdePartCell.mock.js
diff --git a/web/src/components/IdePartCell/IdePartCell.stories.js b/app/web/src/components/IdePartCell/IdePartCell.stories.js
similarity index 100%
rename from web/src/components/IdePartCell/IdePartCell.stories.js
rename to app/web/src/components/IdePartCell/IdePartCell.stories.js
diff --git a/web/src/components/IdePartCell/IdePartCell.test.js b/app/web/src/components/IdePartCell/IdePartCell.test.js
similarity index 100%
rename from web/src/components/IdePartCell/IdePartCell.test.js
rename to app/web/src/components/IdePartCell/IdePartCell.test.js
diff --git a/web/src/components/IdeToolbar/IdeToolbar.js b/app/web/src/components/IdeToolbar/IdeToolbar.js
similarity index 100%
rename from web/src/components/IdeToolbar/IdeToolbar.js
rename to app/web/src/components/IdeToolbar/IdeToolbar.js
diff --git a/web/src/components/IdeToolbar/IdeToolbar.stories.js b/app/web/src/components/IdeToolbar/IdeToolbar.stories.js
similarity index 100%
rename from web/src/components/IdeToolbar/IdeToolbar.stories.js
rename to app/web/src/components/IdeToolbar/IdeToolbar.stories.js
diff --git a/web/src/components/IdeToolbar/IdeToolbar.test.js b/app/web/src/components/IdeToolbar/IdeToolbar.test.js
similarity index 100%
rename from web/src/components/IdeToolbar/IdeToolbar.test.js
rename to app/web/src/components/IdeToolbar/IdeToolbar.test.js
diff --git a/web/src/components/IdeToolbarNew/IdeToolbarNew.js b/app/web/src/components/IdeToolbarNew/IdeToolbarNew.js
similarity index 100%
rename from web/src/components/IdeToolbarNew/IdeToolbarNew.js
rename to app/web/src/components/IdeToolbarNew/IdeToolbarNew.js
diff --git a/web/src/components/IdeViewer/IdeViewer.js b/app/web/src/components/IdeViewer/IdeViewer.js
similarity index 100%
rename from web/src/components/IdeViewer/IdeViewer.js
rename to app/web/src/components/IdeViewer/IdeViewer.js
diff --git a/web/src/components/ImageUploader/ImageUploader.js b/app/web/src/components/ImageUploader/ImageUploader.js
similarity index 100%
rename from web/src/components/ImageUploader/ImageUploader.js
rename to app/web/src/components/ImageUploader/ImageUploader.js
diff --git a/web/src/components/ImageUploader/ImageUploader.stories.js b/app/web/src/components/ImageUploader/ImageUploader.stories.js
similarity index 100%
rename from web/src/components/ImageUploader/ImageUploader.stories.js
rename to app/web/src/components/ImageUploader/ImageUploader.stories.js
diff --git a/web/src/components/ImageUploader/ImageUploader.test.js b/app/web/src/components/ImageUploader/ImageUploader.test.js
similarity index 100%
rename from web/src/components/ImageUploader/ImageUploader.test.js
rename to app/web/src/components/ImageUploader/ImageUploader.test.js
diff --git a/web/src/components/InputText/InputText.js b/app/web/src/components/InputText/InputText.js
similarity index 100%
rename from web/src/components/InputText/InputText.js
rename to app/web/src/components/InputText/InputText.js
diff --git a/web/src/components/InputText/InputText.stories.js b/app/web/src/components/InputText/InputText.stories.js
similarity index 100%
rename from web/src/components/InputText/InputText.stories.js
rename to app/web/src/components/InputText/InputText.stories.js
diff --git a/web/src/components/InputText/InputText.test.js b/app/web/src/components/InputText/InputText.test.js
similarity index 100%
rename from web/src/components/InputText/InputText.test.js
rename to app/web/src/components/InputText/InputText.test.js
diff --git a/web/src/components/InputTextForm/InputTextForm.js b/app/web/src/components/InputTextForm/InputTextForm.js
similarity index 100%
rename from web/src/components/InputTextForm/InputTextForm.js
rename to app/web/src/components/InputTextForm/InputTextForm.js
diff --git a/web/src/components/InputTextForm/InputTextForm.stories.js b/app/web/src/components/InputTextForm/InputTextForm.stories.js
similarity index 100%
rename from web/src/components/InputTextForm/InputTextForm.stories.js
rename to app/web/src/components/InputTextForm/InputTextForm.stories.js
diff --git a/web/src/components/InputTextForm/InputTextForm.test.js b/app/web/src/components/InputTextForm/InputTextForm.test.js
similarity index 100%
rename from web/src/components/InputTextForm/InputTextForm.test.js
rename to app/web/src/components/InputTextForm/InputTextForm.test.js
diff --git a/web/src/components/LandingSection/LandingSection.js b/app/web/src/components/LandingSection/LandingSection.js
similarity index 100%
rename from web/src/components/LandingSection/LandingSection.js
rename to app/web/src/components/LandingSection/LandingSection.js
diff --git a/web/src/components/LandingSection/LandingSection.stories.js b/app/web/src/components/LandingSection/LandingSection.stories.js
similarity index 100%
rename from web/src/components/LandingSection/LandingSection.stories.js
rename to app/web/src/components/LandingSection/LandingSection.stories.js
diff --git a/web/src/components/LandingSection/LandingSection.test.js b/app/web/src/components/LandingSection/LandingSection.test.js
similarity index 100%
rename from web/src/components/LandingSection/LandingSection.test.js
rename to app/web/src/components/LandingSection/LandingSection.test.js
diff --git a/web/src/components/LandingSection/mockEditorParts.js b/app/web/src/components/LandingSection/mockEditorParts.js
similarity index 100%
rename from web/src/components/LandingSection/mockEditorParts.js
rename to app/web/src/components/LandingSection/mockEditorParts.js
diff --git a/web/src/components/LoginModal/LoginModal.js b/app/web/src/components/LoginModal/LoginModal.js
similarity index 100%
rename from web/src/components/LoginModal/LoginModal.js
rename to app/web/src/components/LoginModal/LoginModal.js
diff --git a/web/src/components/LoginModal/LoginModal.stories.js b/app/web/src/components/LoginModal/LoginModal.stories.js
similarity index 100%
rename from web/src/components/LoginModal/LoginModal.stories.js
rename to app/web/src/components/LoginModal/LoginModal.stories.js
diff --git a/web/src/components/LoginModal/LoginModal.test.js b/app/web/src/components/LoginModal/LoginModal.test.js
similarity index 100%
rename from web/src/components/LoginModal/LoginModal.test.js
rename to app/web/src/components/LoginModal/LoginModal.test.js
diff --git a/web/src/components/NavPlusButton/NavPlusButton.tsx b/app/web/src/components/NavPlusButton/NavPlusButton.tsx
similarity index 100%
rename from web/src/components/NavPlusButton/NavPlusButton.tsx
rename to app/web/src/components/NavPlusButton/NavPlusButton.tsx
diff --git a/web/src/components/OutBound/OutBound.js b/app/web/src/components/OutBound/OutBound.js
similarity index 100%
rename from web/src/components/OutBound/OutBound.js
rename to app/web/src/components/OutBound/OutBound.js
diff --git a/web/src/components/OutBound/OutBound.stories.js b/app/web/src/components/OutBound/OutBound.stories.js
similarity index 100%
rename from web/src/components/OutBound/OutBound.stories.js
rename to app/web/src/components/OutBound/OutBound.stories.js
diff --git a/web/src/components/OutBound/OutBound.test.js b/app/web/src/components/OutBound/OutBound.test.js
similarity index 100%
rename from web/src/components/OutBound/OutBound.test.js
rename to app/web/src/components/OutBound/OutBound.test.js
diff --git a/web/src/components/PartCell/PartCell.js b/app/web/src/components/PartCell/PartCell.js
similarity index 100%
rename from web/src/components/PartCell/PartCell.js
rename to app/web/src/components/PartCell/PartCell.js
diff --git a/web/src/components/PartCell/PartCell.mock.js b/app/web/src/components/PartCell/PartCell.mock.js
similarity index 100%
rename from web/src/components/PartCell/PartCell.mock.js
rename to app/web/src/components/PartCell/PartCell.mock.js
diff --git a/web/src/components/PartCell/PartCell.stories.js b/app/web/src/components/PartCell/PartCell.stories.js
similarity index 100%
rename from web/src/components/PartCell/PartCell.stories.js
rename to app/web/src/components/PartCell/PartCell.stories.js
diff --git a/web/src/components/PartCell/PartCell.test.js b/app/web/src/components/PartCell/PartCell.test.js
similarity index 100%
rename from web/src/components/PartCell/PartCell.test.js
rename to app/web/src/components/PartCell/PartCell.test.js
diff --git a/web/src/components/PartForm/PartForm.js b/app/web/src/components/PartForm/PartForm.js
similarity index 100%
rename from web/src/components/PartForm/PartForm.js
rename to app/web/src/components/PartForm/PartForm.js
diff --git a/web/src/components/PartProfile/PartProfile.js b/app/web/src/components/PartProfile/PartProfile.js
similarity index 100%
rename from web/src/components/PartProfile/PartProfile.js
rename to app/web/src/components/PartProfile/PartProfile.js
diff --git a/web/src/components/PartProfile/PartProfile.stories.js b/app/web/src/components/PartProfile/PartProfile.stories.js
similarity index 100%
rename from web/src/components/PartProfile/PartProfile.stories.js
rename to app/web/src/components/PartProfile/PartProfile.stories.js
diff --git a/web/src/components/PartProfile/PartProfile.test.js b/app/web/src/components/PartProfile/PartProfile.test.js
similarity index 100%
rename from web/src/components/PartProfile/PartProfile.test.js
rename to app/web/src/components/PartProfile/PartProfile.test.js
diff --git a/web/src/components/PartReactions/PartReactions.js b/app/web/src/components/PartReactions/PartReactions.js
similarity index 100%
rename from web/src/components/PartReactions/PartReactions.js
rename to app/web/src/components/PartReactions/PartReactions.js
diff --git a/web/src/components/PartReactions/PartReactions.test.js b/app/web/src/components/PartReactions/PartReactions.test.js
similarity index 100%
rename from web/src/components/PartReactions/PartReactions.test.js
rename to app/web/src/components/PartReactions/PartReactions.test.js
diff --git a/web/src/components/PartReactionsCell/PartReactionsCell.js b/app/web/src/components/PartReactionsCell/PartReactionsCell.js
similarity index 100%
rename from web/src/components/PartReactionsCell/PartReactionsCell.js
rename to app/web/src/components/PartReactionsCell/PartReactionsCell.js
diff --git a/web/src/components/PartReactionsCell/PartReactionsCell.mock.js b/app/web/src/components/PartReactionsCell/PartReactionsCell.mock.js
similarity index 100%
rename from web/src/components/PartReactionsCell/PartReactionsCell.mock.js
rename to app/web/src/components/PartReactionsCell/PartReactionsCell.mock.js
diff --git a/web/src/components/PartReactionsCell/PartReactionsCell.stories.js b/app/web/src/components/PartReactionsCell/PartReactionsCell.stories.js
similarity index 100%
rename from web/src/components/PartReactionsCell/PartReactionsCell.stories.js
rename to app/web/src/components/PartReactionsCell/PartReactionsCell.stories.js
diff --git a/web/src/components/PartReactionsCell/PartReactionsCell.test.js b/app/web/src/components/PartReactionsCell/PartReactionsCell.test.js
similarity index 100%
rename from web/src/components/PartReactionsCell/PartReactionsCell.test.js
rename to app/web/src/components/PartReactionsCell/PartReactionsCell.test.js
diff --git a/web/src/components/Parts/Parts.js b/app/web/src/components/Parts/Parts.js
similarity index 100%
rename from web/src/components/Parts/Parts.js
rename to app/web/src/components/Parts/Parts.js
diff --git a/web/src/components/PartsCell/PartsCell.js b/app/web/src/components/PartsCell/PartsCell.js
similarity index 100%
rename from web/src/components/PartsCell/PartsCell.js
rename to app/web/src/components/PartsCell/PartsCell.js
diff --git a/web/src/components/PartsOfUserCell/PartsOfUserCell.js b/app/web/src/components/PartsOfUserCell/PartsOfUserCell.js
similarity index 100%
rename from web/src/components/PartsOfUserCell/PartsOfUserCell.js
rename to app/web/src/components/PartsOfUserCell/PartsOfUserCell.js
diff --git a/web/src/components/PartsOfUserCell/PartsOfUserCell.mock.js b/app/web/src/components/PartsOfUserCell/PartsOfUserCell.mock.js
similarity index 100%
rename from web/src/components/PartsOfUserCell/PartsOfUserCell.mock.js
rename to app/web/src/components/PartsOfUserCell/PartsOfUserCell.mock.js
diff --git a/web/src/components/PartsOfUserCell/PartsOfUserCell.stories.js b/app/web/src/components/PartsOfUserCell/PartsOfUserCell.stories.js
similarity index 100%
rename from web/src/components/PartsOfUserCell/PartsOfUserCell.stories.js
rename to app/web/src/components/PartsOfUserCell/PartsOfUserCell.stories.js
diff --git a/web/src/components/PartsOfUserCell/PartsOfUserCell.test.js b/app/web/src/components/PartsOfUserCell/PartsOfUserCell.test.js
similarity index 100%
rename from web/src/components/PartsOfUserCell/PartsOfUserCell.test.js
rename to app/web/src/components/PartsOfUserCell/PartsOfUserCell.test.js
diff --git a/web/src/components/ProfileTextInput/ProfileTextInput.js b/app/web/src/components/ProfileTextInput/ProfileTextInput.js
similarity index 100%
rename from web/src/components/ProfileTextInput/ProfileTextInput.js
rename to app/web/src/components/ProfileTextInput/ProfileTextInput.js
diff --git a/web/src/components/ProfileTextInput/ProfileTextInput.stories.js b/app/web/src/components/ProfileTextInput/ProfileTextInput.stories.js
similarity index 100%
rename from web/src/components/ProfileTextInput/ProfileTextInput.stories.js
rename to app/web/src/components/ProfileTextInput/ProfileTextInput.stories.js
diff --git a/web/src/components/ProfileTextInput/ProfileTextInput.test.js b/app/web/src/components/ProfileTextInput/ProfileTextInput.test.js
similarity index 100%
rename from web/src/components/ProfileTextInput/ProfileTextInput.test.js
rename to app/web/src/components/ProfileTextInput/ProfileTextInput.test.js
diff --git a/web/src/components/Seo/Seo.js b/app/web/src/components/Seo/Seo.js
similarity index 100%
rename from web/src/components/Seo/Seo.js
rename to app/web/src/components/Seo/Seo.js
diff --git a/web/src/components/SubjectAccessRequest/SubjectAccessRequest.js b/app/web/src/components/SubjectAccessRequest/SubjectAccessRequest.js
similarity index 100%
rename from web/src/components/SubjectAccessRequest/SubjectAccessRequest.js
rename to app/web/src/components/SubjectAccessRequest/SubjectAccessRequest.js
diff --git a/web/src/components/SubjectAccessRequestCell/SubjectAccessRequestCell.js b/app/web/src/components/SubjectAccessRequestCell/SubjectAccessRequestCell.js
similarity index 100%
rename from web/src/components/SubjectAccessRequestCell/SubjectAccessRequestCell.js
rename to app/web/src/components/SubjectAccessRequestCell/SubjectAccessRequestCell.js
diff --git a/web/src/components/SubjectAccessRequestForm/SubjectAccessRequestForm.js b/app/web/src/components/SubjectAccessRequestForm/SubjectAccessRequestForm.js
similarity index 100%
rename from web/src/components/SubjectAccessRequestForm/SubjectAccessRequestForm.js
rename to app/web/src/components/SubjectAccessRequestForm/SubjectAccessRequestForm.js
diff --git a/web/src/components/SubjectAccessRequests/SubjectAccessRequests.js b/app/web/src/components/SubjectAccessRequests/SubjectAccessRequests.js
similarity index 100%
rename from web/src/components/SubjectAccessRequests/SubjectAccessRequests.js
rename to app/web/src/components/SubjectAccessRequests/SubjectAccessRequests.js
diff --git a/web/src/components/SubjectAccessRequestsCell/SubjectAccessRequestsCell.js b/app/web/src/components/SubjectAccessRequestsCell/SubjectAccessRequestsCell.js
similarity index 100%
rename from web/src/components/SubjectAccessRequestsCell/SubjectAccessRequestsCell.js
rename to app/web/src/components/SubjectAccessRequestsCell/SubjectAccessRequestsCell.js
diff --git a/web/src/components/Svg/Svg.js b/app/web/src/components/Svg/Svg.js
similarity index 100%
rename from web/src/components/Svg/Svg.js
rename to app/web/src/components/Svg/Svg.js
diff --git a/web/src/components/UserProfile/UserProfile.js b/app/web/src/components/UserProfile/UserProfile.js
similarity index 100%
rename from web/src/components/UserProfile/UserProfile.js
rename to app/web/src/components/UserProfile/UserProfile.js
diff --git a/web/src/components/UserProfile/UserProfile.stories.js b/app/web/src/components/UserProfile/UserProfile.stories.js
similarity index 100%
rename from web/src/components/UserProfile/UserProfile.stories.js
rename to app/web/src/components/UserProfile/UserProfile.stories.js
diff --git a/web/src/components/UserProfile/UserProfile.test.js b/app/web/src/components/UserProfile/UserProfile.test.js
similarity index 100%
rename from web/src/components/UserProfile/UserProfile.test.js
rename to app/web/src/components/UserProfile/UserProfile.test.js
diff --git a/web/src/components/Users/Users.js b/app/web/src/components/Users/Users.js
similarity index 100%
rename from web/src/components/Users/Users.js
rename to app/web/src/components/Users/Users.js
diff --git a/web/src/components/UsersCell/UsersCell.js b/app/web/src/components/UsersCell/UsersCell.js
similarity index 100%
rename from web/src/components/UsersCell/UsersCell.js
rename to app/web/src/components/UsersCell/UsersCell.js
diff --git a/web/src/favicon.svg b/app/web/src/favicon.svg
similarity index 100%
rename from web/src/favicon.svg
rename to app/web/src/favicon.svg
diff --git a/web/src/helpers/cadPackages/cadQueryController.js b/app/web/src/helpers/cadPackages/cadQueryController.js
similarity index 100%
rename from web/src/helpers/cadPackages/cadQueryController.js
rename to app/web/src/helpers/cadPackages/cadQueryController.js
diff --git a/web/src/helpers/cadPackages/common.js b/app/web/src/helpers/cadPackages/common.js
similarity index 100%
rename from web/src/helpers/cadPackages/common.js
rename to app/web/src/helpers/cadPackages/common.js
diff --git a/web/src/helpers/cadPackages/index.js b/app/web/src/helpers/cadPackages/index.js
similarity index 100%
rename from web/src/helpers/cadPackages/index.js
rename to app/web/src/helpers/cadPackages/index.js
diff --git a/web/src/helpers/cadPackages/openScadController.js b/app/web/src/helpers/cadPackages/openScadController.js
similarity index 100%
rename from web/src/helpers/cadPackages/openScadController.js
rename to app/web/src/helpers/cadPackages/openScadController.js
diff --git a/web/src/helpers/cascadeController.js b/app/web/src/helpers/cascadeController.js
similarity index 100%
rename from web/src/helpers/cascadeController.js
rename to app/web/src/helpers/cascadeController.js
diff --git a/web/src/helpers/clipboard.js b/app/web/src/helpers/clipboard.js
similarity index 100%
rename from web/src/helpers/clipboard.js
rename to app/web/src/helpers/clipboard.js
diff --git a/web/src/helpers/cloudinary.js b/app/web/src/helpers/cloudinary.js
similarity index 100%
rename from web/src/helpers/cloudinary.js
rename to app/web/src/helpers/cloudinary.js
diff --git a/web/src/helpers/emote.js b/app/web/src/helpers/emote.js
similarity index 100%
rename from web/src/helpers/emote.js
rename to app/web/src/helpers/emote.js
diff --git a/web/src/helpers/hooks/useIdeState.js b/app/web/src/helpers/hooks/useIdeState.js
similarity index 100%
rename from web/src/helpers/hooks/useIdeState.js
rename to app/web/src/helpers/hooks/useIdeState.js
diff --git a/web/src/helpers/hooks/useKeyPress.js b/app/web/src/helpers/hooks/useKeyPress.js
similarity index 100%
rename from web/src/helpers/hooks/useKeyPress.js
rename to app/web/src/helpers/hooks/useKeyPress.js
diff --git a/web/src/helpers/hooks/useUser.js b/app/web/src/helpers/hooks/useUser.js
similarity index 100%
rename from web/src/helpers/hooks/useUser.js
rename to app/web/src/helpers/hooks/useUser.js
diff --git a/web/src/helpers/subscribe.js b/app/web/src/helpers/subscribe.js
similarity index 100%
rename from web/src/helpers/subscribe.js
rename to app/web/src/helpers/subscribe.js
diff --git a/web/src/index.css b/app/web/src/index.css
similarity index 100%
rename from web/src/index.css
rename to app/web/src/index.css
diff --git a/web/src/index.html b/app/web/src/index.html
similarity index 100%
rename from web/src/index.html
rename to app/web/src/index.html
diff --git a/web/src/layouts/.keep b/app/web/src/layouts/.keep
similarity index 100%
rename from web/src/layouts/.keep
rename to app/web/src/layouts/.keep
diff --git a/web/src/layouts/MainLayout/Logo_2.jpg b/app/web/src/layouts/MainLayout/Logo_2.jpg
similarity index 100%
rename from web/src/layouts/MainLayout/Logo_2.jpg
rename to app/web/src/layouts/MainLayout/Logo_2.jpg
diff --git a/web/src/layouts/MainLayout/MainLayout.js b/app/web/src/layouts/MainLayout/MainLayout.js
similarity index 100%
rename from web/src/layouts/MainLayout/MainLayout.js
rename to app/web/src/layouts/MainLayout/MainLayout.js
diff --git a/web/src/layouts/MainLayout/MainLayout.stories.js b/app/web/src/layouts/MainLayout/MainLayout.stories.js
similarity index 100%
rename from web/src/layouts/MainLayout/MainLayout.stories.js
rename to app/web/src/layouts/MainLayout/MainLayout.stories.js
diff --git a/web/src/layouts/MainLayout/MainLayout.test.js b/app/web/src/layouts/MainLayout/MainLayout.test.js
similarity index 100%
rename from web/src/layouts/MainLayout/MainLayout.test.js
rename to app/web/src/layouts/MainLayout/MainLayout.test.js
diff --git a/web/src/layouts/SubjectAccessRequestsLayout/SubjectAccessRequestsLayout.js b/app/web/src/layouts/SubjectAccessRequestsLayout/SubjectAccessRequestsLayout.js
similarity index 100%
rename from web/src/layouts/SubjectAccessRequestsLayout/SubjectAccessRequestsLayout.js
rename to app/web/src/layouts/SubjectAccessRequestsLayout/SubjectAccessRequestsLayout.js
diff --git a/web/src/pages/AccountRecoveryPage/AccountRecoveryPage.js b/app/web/src/pages/AccountRecoveryPage/AccountRecoveryPage.js
similarity index 100%
rename from web/src/pages/AccountRecoveryPage/AccountRecoveryPage.js
rename to app/web/src/pages/AccountRecoveryPage/AccountRecoveryPage.js
diff --git a/web/src/pages/AccountRecoveryPage/AccountRecoveryPage.stories.js b/app/web/src/pages/AccountRecoveryPage/AccountRecoveryPage.stories.js
similarity index 100%
rename from web/src/pages/AccountRecoveryPage/AccountRecoveryPage.stories.js
rename to app/web/src/pages/AccountRecoveryPage/AccountRecoveryPage.stories.js
diff --git a/web/src/pages/AccountRecoveryPage/AccountRecoveryPage.test.js b/app/web/src/pages/AccountRecoveryPage/AccountRecoveryPage.test.js
similarity index 100%
rename from web/src/pages/AccountRecoveryPage/AccountRecoveryPage.test.js
rename to app/web/src/pages/AccountRecoveryPage/AccountRecoveryPage.test.js
diff --git a/web/src/pages/AdminPartsPage/AdminPartsPage.js b/app/web/src/pages/AdminPartsPage/AdminPartsPage.js
similarity index 100%
rename from web/src/pages/AdminPartsPage/AdminPartsPage.js
rename to app/web/src/pages/AdminPartsPage/AdminPartsPage.js
diff --git a/web/src/pages/CodeOfConductPage/CodeOfConductPage.js b/app/web/src/pages/CodeOfConductPage/CodeOfConductPage.js
similarity index 100%
rename from web/src/pages/CodeOfConductPage/CodeOfConductPage.js
rename to app/web/src/pages/CodeOfConductPage/CodeOfConductPage.js
diff --git a/web/src/pages/CodeOfConductPage/CodeOfConductPage.stories.js b/app/web/src/pages/CodeOfConductPage/CodeOfConductPage.stories.js
similarity index 100%
rename from web/src/pages/CodeOfConductPage/CodeOfConductPage.stories.js
rename to app/web/src/pages/CodeOfConductPage/CodeOfConductPage.stories.js
diff --git a/web/src/pages/CodeOfConductPage/CodeOfConductPage.test.js b/app/web/src/pages/CodeOfConductPage/CodeOfConductPage.test.js
similarity index 100%
rename from web/src/pages/CodeOfConductPage/CodeOfConductPage.test.js
rename to app/web/src/pages/CodeOfConductPage/CodeOfConductPage.test.js
diff --git a/web/src/pages/DevIdePage/DevIdePage.js b/app/web/src/pages/DevIdePage/DevIdePage.js
similarity index 100%
rename from web/src/pages/DevIdePage/DevIdePage.js
rename to app/web/src/pages/DevIdePage/DevIdePage.js
diff --git a/web/src/pages/DraftPartPage/DraftPartPage.js b/app/web/src/pages/DraftPartPage/DraftPartPage.js
similarity index 100%
rename from web/src/pages/DraftPartPage/DraftPartPage.js
rename to app/web/src/pages/DraftPartPage/DraftPartPage.js
diff --git a/web/src/pages/DraftPartPage/DraftPartPage.stories.js b/app/web/src/pages/DraftPartPage/DraftPartPage.stories.js
similarity index 100%
rename from web/src/pages/DraftPartPage/DraftPartPage.stories.js
rename to app/web/src/pages/DraftPartPage/DraftPartPage.stories.js
diff --git a/web/src/pages/DraftPartPage/DraftPartPage.test.js b/app/web/src/pages/DraftPartPage/DraftPartPage.test.js
similarity index 100%
rename from web/src/pages/DraftPartPage/DraftPartPage.test.js
rename to app/web/src/pages/DraftPartPage/DraftPartPage.test.js
diff --git a/web/src/pages/EditPartPage/EditPartPage.js b/app/web/src/pages/EditPartPage/EditPartPage.js
similarity index 100%
rename from web/src/pages/EditPartPage/EditPartPage.js
rename to app/web/src/pages/EditPartPage/EditPartPage.js
diff --git a/web/src/pages/EditPartPage/EditPartPage.stories.js b/app/web/src/pages/EditPartPage/EditPartPage.stories.js
similarity index 100%
rename from web/src/pages/EditPartPage/EditPartPage.stories.js
rename to app/web/src/pages/EditPartPage/EditPartPage.stories.js
diff --git a/web/src/pages/EditPartPage/EditPartPage.test.js b/app/web/src/pages/EditPartPage/EditPartPage.test.js
similarity index 100%
rename from web/src/pages/EditPartPage/EditPartPage.test.js
rename to app/web/src/pages/EditPartPage/EditPartPage.test.js
diff --git a/web/src/pages/EditSubjectAccessRequestPage/EditSubjectAccessRequestPage.js b/app/web/src/pages/EditSubjectAccessRequestPage/EditSubjectAccessRequestPage.js
similarity index 100%
rename from web/src/pages/EditSubjectAccessRequestPage/EditSubjectAccessRequestPage.js
rename to app/web/src/pages/EditSubjectAccessRequestPage/EditSubjectAccessRequestPage.js
diff --git a/web/src/pages/EditUserPage/EditUserPage.js b/app/web/src/pages/EditUserPage/EditUserPage.js
similarity index 100%
rename from web/src/pages/EditUserPage/EditUserPage.js
rename to app/web/src/pages/EditUserPage/EditUserPage.js
diff --git a/web/src/pages/FatalErrorPage/FatalErrorPage.js b/app/web/src/pages/FatalErrorPage/FatalErrorPage.js
similarity index 100%
rename from web/src/pages/FatalErrorPage/FatalErrorPage.js
rename to app/web/src/pages/FatalErrorPage/FatalErrorPage.js
diff --git a/web/src/pages/HomePage/HomePage.js b/app/web/src/pages/HomePage/HomePage.js
similarity index 100%
rename from web/src/pages/HomePage/HomePage.js
rename to app/web/src/pages/HomePage/HomePage.js
diff --git a/web/src/pages/IdePartPage/IdePartPage.js b/app/web/src/pages/IdePartPage/IdePartPage.js
similarity index 100%
rename from web/src/pages/IdePartPage/IdePartPage.js
rename to app/web/src/pages/IdePartPage/IdePartPage.js
diff --git a/web/src/pages/IdePartPage/IdePartPage.test.js b/app/web/src/pages/IdePartPage/IdePartPage.test.js
similarity index 100%
rename from web/src/pages/IdePartPage/IdePartPage.test.js
rename to app/web/src/pages/IdePartPage/IdePartPage.test.js
diff --git a/web/src/pages/NewPartPage/NewPartPage.js b/app/web/src/pages/NewPartPage/NewPartPage.js
similarity index 100%
rename from web/src/pages/NewPartPage/NewPartPage.js
rename to app/web/src/pages/NewPartPage/NewPartPage.js
diff --git a/web/src/pages/NewPartPage/NewPartPage.stories.js b/app/web/src/pages/NewPartPage/NewPartPage.stories.js
similarity index 100%
rename from web/src/pages/NewPartPage/NewPartPage.stories.js
rename to app/web/src/pages/NewPartPage/NewPartPage.stories.js
diff --git a/web/src/pages/NewPartPage/NewPartPage.test.js b/app/web/src/pages/NewPartPage/NewPartPage.test.js
similarity index 100%
rename from web/src/pages/NewPartPage/NewPartPage.test.js
rename to app/web/src/pages/NewPartPage/NewPartPage.test.js
diff --git a/web/src/pages/NotFoundPage/NotFoundPage.js b/app/web/src/pages/NotFoundPage/NotFoundPage.js
similarity index 100%
rename from web/src/pages/NotFoundPage/NotFoundPage.js
rename to app/web/src/pages/NotFoundPage/NotFoundPage.js
diff --git a/web/src/pages/PartPage/PartPage.js b/app/web/src/pages/PartPage/PartPage.js
similarity index 100%
rename from web/src/pages/PartPage/PartPage.js
rename to app/web/src/pages/PartPage/PartPage.js
diff --git a/web/src/pages/PartPage/PartPage.stories.js b/app/web/src/pages/PartPage/PartPage.stories.js
similarity index 100%
rename from web/src/pages/PartPage/PartPage.stories.js
rename to app/web/src/pages/PartPage/PartPage.stories.js
diff --git a/web/src/pages/PartPage/PartPage.test.js b/app/web/src/pages/PartPage/PartPage.test.js
similarity index 100%
rename from web/src/pages/PartPage/PartPage.test.js
rename to app/web/src/pages/PartPage/PartPage.test.js
diff --git a/web/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.js b/app/web/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.js
similarity index 100%
rename from web/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.js
rename to app/web/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.js
diff --git a/web/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.stories.js b/app/web/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.stories.js
similarity index 100%
rename from web/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.stories.js
rename to app/web/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.stories.js
diff --git a/web/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.test.js b/app/web/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.test.js
similarity index 100%
rename from web/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.test.js
rename to app/web/src/pages/PrivacyPolicyPage/PrivacyPolicyPage.test.js
diff --git a/web/src/pages/SubjectAccessRequestPage/SubjectAccessRequestPage.js b/app/web/src/pages/SubjectAccessRequestPage/SubjectAccessRequestPage.js
similarity index 100%
rename from web/src/pages/SubjectAccessRequestPage/SubjectAccessRequestPage.js
rename to app/web/src/pages/SubjectAccessRequestPage/SubjectAccessRequestPage.js
diff --git a/web/src/pages/SubjectAccessRequestPage/SubjectAccessRequestPage.stories.js b/app/web/src/pages/SubjectAccessRequestPage/SubjectAccessRequestPage.stories.js
similarity index 100%
rename from web/src/pages/SubjectAccessRequestPage/SubjectAccessRequestPage.stories.js
rename to app/web/src/pages/SubjectAccessRequestPage/SubjectAccessRequestPage.stories.js
diff --git a/web/src/pages/SubjectAccessRequestPage/SubjectAccessRequestPage.test.js b/app/web/src/pages/SubjectAccessRequestPage/SubjectAccessRequestPage.test.js
similarity index 100%
rename from web/src/pages/SubjectAccessRequestPage/SubjectAccessRequestPage.test.js
rename to app/web/src/pages/SubjectAccessRequestPage/SubjectAccessRequestPage.test.js
diff --git a/web/src/pages/SubjectAccessRequestsPage/SubjectAccessRequestsPage.js b/app/web/src/pages/SubjectAccessRequestsPage/SubjectAccessRequestsPage.js
similarity index 100%
rename from web/src/pages/SubjectAccessRequestsPage/SubjectAccessRequestsPage.js
rename to app/web/src/pages/SubjectAccessRequestsPage/SubjectAccessRequestsPage.js
diff --git a/web/src/pages/UpdatePasswordPage/UpdatePasswordPage.js b/app/web/src/pages/UpdatePasswordPage/UpdatePasswordPage.js
similarity index 100%
rename from web/src/pages/UpdatePasswordPage/UpdatePasswordPage.js
rename to app/web/src/pages/UpdatePasswordPage/UpdatePasswordPage.js
diff --git a/web/src/pages/UpdatePasswordPage/UpdatePasswordPage.stories.js b/app/web/src/pages/UpdatePasswordPage/UpdatePasswordPage.stories.js
similarity index 100%
rename from web/src/pages/UpdatePasswordPage/UpdatePasswordPage.stories.js
rename to app/web/src/pages/UpdatePasswordPage/UpdatePasswordPage.stories.js
diff --git a/web/src/pages/UpdatePasswordPage/UpdatePasswordPage.test.js b/app/web/src/pages/UpdatePasswordPage/UpdatePasswordPage.test.js
similarity index 100%
rename from web/src/pages/UpdatePasswordPage/UpdatePasswordPage.test.js
rename to app/web/src/pages/UpdatePasswordPage/UpdatePasswordPage.test.js
diff --git a/web/src/pages/UserPage/UserPage.js b/app/web/src/pages/UserPage/UserPage.js
similarity index 100%
rename from web/src/pages/UserPage/UserPage.js
rename to app/web/src/pages/UserPage/UserPage.js
diff --git a/web/src/pages/UsersPage/UsersPage.js b/app/web/src/pages/UsersPage/UsersPage.js
similarity index 100%
rename from web/src/pages/UsersPage/UsersPage.js
rename to app/web/src/pages/UsersPage/UsersPage.js
diff --git a/web/src/scaffold.css b/app/web/src/scaffold.css
similarity index 100%
rename from web/src/scaffold.css
rename to app/web/src/scaffold.css
diff --git a/web/tailwind.config.js b/app/web/tailwind.config.js
similarity index 100%
rename from web/tailwind.config.js
rename to app/web/tailwind.config.js
diff --git a/yarn.lock b/app/yarn.lock
similarity index 100%
rename from yarn.lock
rename to app/yarn.lock