diff --git a/src/features/misc/modals/main/marketplace/components/Collection/Collection.jsx b/src/features/marketplace/components/Collection/Collection.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/Collection/Collection.jsx
rename to src/features/marketplace/components/Collection/Collection.jsx
diff --git a/src/features/misc/modals/main/marketplace/components/Collection/index.jsx b/src/features/marketplace/components/Collection/index.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/Collection/index.jsx
rename to src/features/marketplace/components/Collection/index.jsx
diff --git a/src/features/misc/modals/main/marketplace/components/Elements/Carousel/Carousel.jsx b/src/features/marketplace/components/Elements/Carousel/Carousel.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/Elements/Carousel/Carousel.jsx
rename to src/features/marketplace/components/Elements/Carousel/Carousel.jsx
diff --git a/src/features/misc/modals/main/marketplace/components/Elements/Carousel/carousel.scss b/src/features/marketplace/components/Elements/Carousel/carousel.scss
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/Elements/Carousel/carousel.scss
rename to src/features/marketplace/components/Elements/Carousel/carousel.scss
diff --git a/src/features/misc/modals/main/marketplace/components/Elements/Carousel/index.jsx b/src/features/marketplace/components/Elements/Carousel/index.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/Elements/Carousel/index.jsx
rename to src/features/marketplace/components/Elements/Carousel/index.jsx
diff --git a/src/features/misc/modals/main/marketplace/components/Elements/Lightbox/Lightbox.jsx b/src/features/marketplace/components/Elements/Lightbox/Lightbox.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/Elements/Lightbox/Lightbox.jsx
rename to src/features/marketplace/components/Elements/Lightbox/Lightbox.jsx
diff --git a/src/features/misc/modals/main/marketplace/components/Elements/Lightbox/index.jsx b/src/features/marketplace/components/Elements/Lightbox/index.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/Elements/Lightbox/index.jsx
rename to src/features/marketplace/components/Elements/Lightbox/index.jsx
diff --git a/src/features/misc/modals/main/marketplace/components/Elements/SideloadFailedModal/SideloadFailedModal.jsx b/src/features/marketplace/components/Elements/SideloadFailedModal/SideloadFailedModal.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/Elements/SideloadFailedModal/SideloadFailedModal.jsx
rename to src/features/marketplace/components/Elements/SideloadFailedModal/SideloadFailedModal.jsx
diff --git a/src/features/misc/modals/main/marketplace/components/Elements/SideloadFailedModal/index.jsx b/src/features/marketplace/components/Elements/SideloadFailedModal/index.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/Elements/SideloadFailedModal/index.jsx
rename to src/features/marketplace/components/Elements/SideloadFailedModal/index.jsx
diff --git a/src/features/misc/modals/main/marketplace/components/Elements/index.jsx b/src/features/marketplace/components/Elements/index.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/Elements/index.jsx
rename to src/features/marketplace/components/Elements/index.jsx
diff --git a/src/features/misc/modals/main/marketplace/components/Items/Item.jsx b/src/features/marketplace/components/Items/Item.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/Items/Item.jsx
rename to src/features/marketplace/components/Items/Item.jsx
diff --git a/src/features/misc/modals/main/marketplace/components/Items/Items.jsx b/src/features/marketplace/components/Items/Items.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/Items/Items.jsx
rename to src/features/marketplace/components/Items/Items.jsx
diff --git a/src/features/misc/modals/main/marketplace/components/index.jsx b/src/features/marketplace/components/index.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/components/index.jsx
rename to src/features/marketplace/components/index.jsx
diff --git a/src/features/misc/modals/main/marketplace/views/Added.jsx b/src/features/marketplace/views/Added.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/views/Added.jsx
rename to src/features/marketplace/views/Added.jsx
diff --git a/src/features/misc/modals/main/marketplace/views/Browse.jsx b/src/features/marketplace/views/Browse.jsx
similarity index 99%
rename from src/features/misc/modals/main/marketplace/views/Browse.jsx
rename to src/features/marketplace/views/Browse.jsx
index db11a781..cdecd1ac 100644
--- a/src/features/misc/modals/main/marketplace/views/Browse.jsx
+++ b/src/features/marketplace/views/Browse.jsx
@@ -12,7 +12,7 @@ import {
 
 import Item from '../components/Items/Item';
 import Items from '../components/Items/Items';
-import Dropdown from '../../../../../../components/Form/Settings/Dropdown/Dropdown';
+import Dropdown from '../../../components/Form/Settings/Dropdown/Dropdown';
 import { Header } from 'components/Layout/Settings';
 import { Button } from 'components/Elements';
 
diff --git a/src/features/misc/modals/main/marketplace/views/Create.jsx b/src/features/marketplace/views/Create.jsx
similarity index 100%
rename from src/features/misc/modals/main/marketplace/views/Create.jsx
rename to src/features/marketplace/views/Create.jsx
diff --git a/src/features/misc/modals/Modals.jsx b/src/features/misc/modals/Modals.jsx
index d1809861..d7c1e97d 100644
--- a/src/features/misc/modals/Modals.jsx
+++ b/src/features/misc/modals/Modals.jsx
@@ -8,7 +8,7 @@ import Preview from '../../helpers/preview/Preview';
 
 import EventBus from 'utils/eventbus';
 
-import Welcome from './welcome/Welcome';
+import Welcome from 'features/welcome/Welcome';
 
 export default class Modals extends PureComponent {
   constructor() {
diff --git a/src/features/misc/modals/main/settings/sections/Changelog.jsx b/src/features/misc/modals/main/settings/sections/Changelog.jsx
index 95d4df2b..f01c2473 100644
--- a/src/features/misc/modals/main/settings/sections/Changelog.jsx
+++ b/src/features/misc/modals/main/settings/sections/Changelog.jsx
@@ -3,7 +3,7 @@ import { PureComponent, createRef } from 'react';
 import { MdOutlineWifiOff } from 'react-icons/md';
 import Modal from 'react-modal';
 
-import Lightbox from '../../marketplace/components/Elements/Lightbox/Lightbox';
+import Lightbox from '../../../../../marketplace/components/Elements/Lightbox/Lightbox';
 
 export default class Changelog extends PureComponent {
   constructor() {
diff --git a/src/features/misc/modals/main/tabs/Addons.jsx b/src/features/misc/modals/main/tabs/Addons.jsx
index 3af185ec..47883ba2 100644
--- a/src/features/misc/modals/main/tabs/Addons.jsx
+++ b/src/features/misc/modals/main/tabs/Addons.jsx
@@ -2,8 +2,8 @@ import variables from 'config/variables';
 import { memo } from 'react';
 import Tabs from './backend/Tabs';
 
-import Added from '../marketplace/views/Added';
-import Create from '../marketplace/views/Create';
+import Added from '../../../../marketplace/views/Added';
+import Create from '../../../../marketplace/views/Create';
 
 function Addons(props) {
   return (
diff --git a/src/features/misc/modals/main/tabs/Marketplace.jsx b/src/features/misc/modals/main/tabs/Marketplace.jsx
index cd87863a..64495084 100644
--- a/src/features/misc/modals/main/tabs/Marketplace.jsx
+++ b/src/features/misc/modals/main/tabs/Marketplace.jsx
@@ -2,7 +2,7 @@ import variables from 'config/variables';
 import { memo } from 'react';
 
 import Tabs from './backend/Tabs';
-import MarketplaceTab from '../marketplace/views/Browse';
+import MarketplaceTab from '../../../../marketplace/views/Browse';
 
 function Marketplace(props) {
   return (
diff --git a/src/features/misc/modals/welcome/Sections/ChooseLanguage.jsx b/src/features/welcome/Sections/ChooseLanguage.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/Sections/ChooseLanguage.jsx
rename to src/features/welcome/Sections/ChooseLanguage.jsx
diff --git a/src/features/misc/modals/welcome/Sections/Final.jsx b/src/features/welcome/Sections/Final.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/Sections/Final.jsx
rename to src/features/welcome/Sections/Final.jsx
diff --git a/src/features/misc/modals/welcome/Sections/ImportSettings.jsx b/src/features/welcome/Sections/ImportSettings.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/Sections/ImportSettings.jsx
rename to src/features/welcome/Sections/ImportSettings.jsx
diff --git a/src/features/misc/modals/welcome/Sections/Intro.jsx b/src/features/welcome/Sections/Intro.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/Sections/Intro.jsx
rename to src/features/welcome/Sections/Intro.jsx
diff --git a/src/features/misc/modals/welcome/Sections/PrivacyOptions.jsx b/src/features/welcome/Sections/PrivacyOptions.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/Sections/PrivacyOptions.jsx
rename to src/features/welcome/Sections/PrivacyOptions.jsx
diff --git a/src/features/misc/modals/welcome/Sections/StyleSelection.jsx b/src/features/welcome/Sections/StyleSelection.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/Sections/StyleSelection.jsx
rename to src/features/welcome/Sections/StyleSelection.jsx
diff --git a/src/features/misc/modals/welcome/Sections/ThemeSelection.jsx b/src/features/welcome/Sections/ThemeSelection.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/Sections/ThemeSelection.jsx
rename to src/features/welcome/Sections/ThemeSelection.jsx
diff --git a/src/features/misc/modals/welcome/Sections/index.jsx b/src/features/welcome/Sections/index.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/Sections/index.jsx
rename to src/features/welcome/Sections/index.jsx
diff --git a/src/features/misc/modals/welcome/Welcome.jsx b/src/features/welcome/Welcome.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/Welcome.jsx
rename to src/features/welcome/Welcome.jsx
diff --git a/src/features/misc/modals/welcome/WelcomeSections.jsx b/src/features/welcome/WelcomeSections.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/WelcomeSections.jsx
rename to src/features/welcome/WelcomeSections.jsx
diff --git a/src/features/misc/modals/welcome/components/Elements/AsideImage/AsideImage.jsx b/src/features/welcome/components/Elements/AsideImage/AsideImage.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/components/Elements/AsideImage/AsideImage.jsx
rename to src/features/welcome/components/Elements/AsideImage/AsideImage.jsx
diff --git a/src/features/misc/modals/welcome/components/Elements/AsideImage/index.jsx b/src/features/welcome/components/Elements/AsideImage/index.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/components/Elements/AsideImage/index.jsx
rename to src/features/welcome/components/Elements/AsideImage/index.jsx
diff --git a/src/features/misc/modals/welcome/components/Elements/ProgressBar/ProgressBar.jsx b/src/features/welcome/components/Elements/ProgressBar/ProgressBar.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/components/Elements/ProgressBar/ProgressBar.jsx
rename to src/features/welcome/components/Elements/ProgressBar/ProgressBar.jsx
diff --git a/src/features/misc/modals/welcome/components/Elements/ProgressBar/index.jsx b/src/features/welcome/components/Elements/ProgressBar/index.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/components/Elements/ProgressBar/index.jsx
rename to src/features/welcome/components/Elements/ProgressBar/index.jsx
diff --git a/src/features/misc/modals/welcome/components/Elements/index.jsx b/src/features/welcome/components/Elements/index.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/components/Elements/index.jsx
rename to src/features/welcome/components/Elements/index.jsx
diff --git a/src/features/misc/modals/welcome/components/Layout/Content.jsx b/src/features/welcome/components/Layout/Content.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/components/Layout/Content.jsx
rename to src/features/welcome/components/Layout/Content.jsx
diff --git a/src/features/misc/modals/welcome/components/Layout/Header.jsx b/src/features/welcome/components/Layout/Header.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/components/Layout/Header.jsx
rename to src/features/welcome/components/Layout/Header.jsx
diff --git a/src/features/misc/modals/welcome/components/Layout/Layout.jsx b/src/features/welcome/components/Layout/Layout.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/components/Layout/Layout.jsx
rename to src/features/welcome/components/Layout/Layout.jsx
diff --git a/src/features/misc/modals/welcome/components/Layout/Panel.jsx b/src/features/welcome/components/Layout/Panel.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/components/Layout/Panel.jsx
rename to src/features/welcome/components/Layout/Panel.jsx
diff --git a/src/features/misc/modals/welcome/components/Layout/Wrapper.jsx b/src/features/welcome/components/Layout/Wrapper.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/components/Layout/Wrapper.jsx
rename to src/features/welcome/components/Layout/Wrapper.jsx
diff --git a/src/features/misc/modals/welcome/components/Layout/index.jsx b/src/features/welcome/components/Layout/index.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/components/Layout/index.jsx
rename to src/features/welcome/components/Layout/index.jsx
diff --git a/src/features/misc/modals/welcome/components/index.jsx b/src/features/welcome/components/index.jsx
similarity index 100%
rename from src/features/misc/modals/welcome/components/index.jsx
rename to src/features/welcome/components/index.jsx
diff --git a/src/features/misc/modals/welcome/welcome.scss b/src/features/welcome/welcome.scss
similarity index 99%
rename from src/features/misc/modals/welcome/welcome.scss
rename to src/features/welcome/welcome.scss
index 796c9116..7bb0f4f7 100644
--- a/src/features/misc/modals/welcome/welcome.scss
+++ b/src/features/welcome/welcome.scss
@@ -1,4 +1,4 @@
-@import '../main/scss/index';
+@import '../../scss/index.scss';
 @import 'scss/variables';
 
 .welcomemodal {