diff --git a/src/App.jsx b/src/App.jsx
index ed5b84f2..ca26e027 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -2,9 +2,9 @@ import variables from 'config/variables';
 import { PureComponent } from 'react';
 import { ToastContainer } from 'react-toastify';
 
-import Background from 'features/widgets/background/Background';
-import Widgets from 'features/widgets/Widgets';
-import Modals from 'features/modals/Modals';
+import Background from 'features/background/Background';
+import Widgets from 'features/misc/views/Widgets';
+import Modals from 'features/misc/modals/Modals';
 
 import { loadSettings, moveSettings } from 'utils/settings';
 
diff --git a/src/features/widgets/background/Background.jsx b/src/features/background/Background.jsx
similarity index 100%
rename from src/features/widgets/background/Background.jsx
rename to src/features/background/Background.jsx
diff --git a/src/features/widgets/background/ExcludeModal.jsx b/src/features/background/ExcludeModal.jsx
similarity index 100%
rename from src/features/widgets/background/ExcludeModal.jsx
rename to src/features/background/ExcludeModal.jsx
diff --git a/src/features/widgets/background/Favourite.jsx b/src/features/background/Favourite.jsx
similarity index 100%
rename from src/features/widgets/background/Favourite.jsx
rename to src/features/background/Favourite.jsx
diff --git a/src/features/widgets/background/Maximise.jsx b/src/features/background/Maximise.jsx
similarity index 100%
rename from src/features/widgets/background/Maximise.jsx
rename to src/features/background/Maximise.jsx
diff --git a/src/features/widgets/background/PhotoInformation.jsx b/src/features/background/PhotoInformation.jsx
similarity index 100%
rename from src/features/widgets/background/PhotoInformation.jsx
rename to src/features/background/PhotoInformation.jsx
diff --git a/src/features/widgets/time/index.jsx b/src/features/background/index.jsx
similarity index 100%
rename from src/features/widgets/time/index.jsx
rename to src/features/background/index.jsx
diff --git a/src/features/modals/main/settings/sections/background/Background.jsx b/src/features/background/options/BackgroundOptions.jsx
similarity index 97%
rename from src/features/modals/main/settings/sections/background/Background.jsx
rename to src/features/background/options/BackgroundOptions.jsx
index 57308d03..e701b28c 100644
--- a/src/features/modals/main/settings/sections/background/Background.jsx
+++ b/src/features/background/options/BackgroundOptions.jsx
@@ -3,24 +3,20 @@ import { PureComponent } from 'react';
 import { MdSource, MdOutlineKeyboardArrowRight, MdOutlineAutoAwesome } from 'react-icons/md';
 
 import { Header } from 'components/Layout/Settings';
-import Checkbox from '../../../../../../components/Form/Settings/Checkbox/Checkbox';
-import ChipSelect from '../../../../../../components/Form/Settings/ChipSelect/ChipSelect';
-import Dropdown from '../../../../../../components/Form/Settings/Dropdown/Dropdown';
-import Slider from '../../../../../../components/Form/Settings/Slider/Slider';
-import Radio from '../../../../../../components/Form/Settings/Radio/Radio';
-import {
-  Row,
-  Content,
-  Action,
-} from '../../../../../../components/Layout/Settings/Item/SettingsItem';
-import Text from '../../../../../../components/Form/Settings/Text/Text';
+import Checkbox from '../../../components/Form/Settings/Checkbox/Checkbox';
+import ChipSelect from '../../../components/Form/Settings/ChipSelect/ChipSelect';
+import Dropdown from '../../../components/Form/Settings/Dropdown/Dropdown';
+import Slider from '../../../components/Form/Settings/Slider/Slider';
+import Radio from '../../../components/Form/Settings/Radio/Radio';
+import { Row, Content, Action } from '../../../components/Layout/Settings/Item/SettingsItem';
+import Text from '../../../components/Form/Settings/Text/Text';
 
 import ColourSettings from './Colour';
 import CustomSettings from './Custom';
 
 import values from 'utils/data/slider_values.json';
 
-export default class BackgroundSettings extends PureComponent {
+class BackgroundOptions extends PureComponent {
   constructor() {
     super();
     this.state = {
@@ -627,3 +623,5 @@ export default class BackgroundSettings extends PureComponent {
     );
   }
 }
+
+export { BackgroundOptions as default, BackgroundOptions };
diff --git a/src/features/modals/main/settings/sections/background/Colour.jsx b/src/features/background/options/Colour.jsx
similarity index 97%
rename from src/features/modals/main/settings/sections/background/Colour.jsx
rename to src/features/background/options/Colour.jsx
index 5ee9df6b..5bd1e554 100644
--- a/src/features/modals/main/settings/sections/background/Colour.jsx
+++ b/src/features/background/options/Colour.jsx
@@ -2,16 +2,12 @@ import variables from 'config/variables';
 import { PureComponent, Fragment } from 'react';
 import { ColorPicker } from '@muetab/react-color-gradient-picker';
 import { toast } from 'react-toastify';
-import {
-  Row,
-  Content,
-  Action,
-} from '../../../../../../components/Layout/Settings/Item/SettingsItem';
+import { Row, Content, Action } from '../../../components/Layout/Settings/Item/SettingsItem';
 
 import { hexToRgb, rgbToHex } from 'utils/background/gradient';
 
 //import '@muetab/react-color-gradient-picker/dist/index.css';
-import '../../../scss/settings/react-color-picker-gradient-picker-custom-styles.scss';
+import '../scss/react-color-picker-gradient-picker-custom-styles.scss';
 
 export default class ColourSettings extends PureComponent {
   DefaultGradientSettings = {
diff --git a/src/features/modals/main/settings/sections/background/Custom.jsx b/src/features/background/options/Custom.jsx
similarity index 98%
rename from src/features/modals/main/settings/sections/background/Custom.jsx
rename to src/features/background/options/Custom.jsx
index ce8ee4e6..df94d0b5 100644
--- a/src/features/modals/main/settings/sections/background/Custom.jsx
+++ b/src/features/background/options/Custom.jsx
@@ -13,8 +13,8 @@ import EventBus from 'utils/eventbus';
 import { compressAccurately, filetoDataURL } from 'image-conversion';
 import { videoCheck } from 'utils/background';
 
-import Checkbox from '../../../../../../components/Form/Settings/Checkbox/Checkbox';
-import FileUpload from '../../../../../../components/Form/Settings/FileUpload/FileUpload';
+import Checkbox from '../../../components/Form/Settings/Checkbox/Checkbox';
+import FileUpload from '../../../components/Form/Settings/FileUpload/FileUpload';
 import { Tooltip } from 'components/Elements';
 import Modal from 'react-modal';
 
diff --git a/src/features/modals/main/settings/sections/background/CustomURLModal.jsx b/src/features/background/options/CustomURLModal.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/background/CustomURLModal.jsx
rename to src/features/background/options/CustomURLModal.jsx
diff --git a/src/features/background/options/index.jsx b/src/features/background/options/index.jsx
new file mode 100644
index 00000000..aaefe7ec
--- /dev/null
+++ b/src/features/background/options/index.jsx
@@ -0,0 +1 @@
+export * from './BackgroundOptions';
diff --git a/src/features/widgets/background/scss/_photoinformation.scss b/src/features/background/scss/_photoinformation.scss
similarity index 100%
rename from src/features/widgets/background/scss/_photoinformation.scss
rename to src/features/background/scss/_photoinformation.scss
diff --git a/src/features/widgets/background/scss/index.scss b/src/features/background/scss/index.scss
similarity index 100%
rename from src/features/widgets/background/scss/index.scss
rename to src/features/background/scss/index.scss
diff --git a/src/features/modals/main/scss/settings/react-color-picker-gradient-picker-custom-styles.scss b/src/features/background/scss/react-color-picker-gradient-picker-custom-styles.scss
similarity index 100%
rename from src/features/modals/main/scss/settings/react-color-picker-gradient-picker-custom-styles.scss
rename to src/features/background/scss/react-color-picker-gradient-picker-custom-styles.scss
diff --git a/src/features/widgets/greeting/Greeting.jsx b/src/features/greeting/Greeting.jsx
similarity index 100%
rename from src/features/widgets/greeting/Greeting.jsx
rename to src/features/greeting/Greeting.jsx
diff --git a/src/features/widgets/greeting/events.json b/src/features/greeting/events.json
similarity index 100%
rename from src/features/widgets/greeting/events.json
rename to src/features/greeting/events.json
diff --git a/src/features/widgets/greeting/greeting.scss b/src/features/greeting/greeting.scss
similarity index 100%
rename from src/features/widgets/greeting/greeting.scss
rename to src/features/greeting/greeting.scss
diff --git a/src/features/widgets/greeting/index.jsx b/src/features/greeting/index.jsx
similarity index 100%
rename from src/features/widgets/greeting/index.jsx
rename to src/features/greeting/index.jsx
diff --git a/src/features/widgets/greeting/options/GreetingOptions.jsx b/src/features/greeting/options/GreetingOptions.jsx
similarity index 100%
rename from src/features/widgets/greeting/options/GreetingOptions.jsx
rename to src/features/greeting/options/GreetingOptions.jsx
diff --git a/src/features/widgets/greeting/options/index.jsx b/src/features/greeting/options/index.jsx
similarity index 100%
rename from src/features/widgets/greeting/options/index.jsx
rename to src/features/greeting/options/index.jsx
diff --git a/src/features/widgets/message/Message.jsx b/src/features/message/Message.jsx
similarity index 100%
rename from src/features/widgets/message/Message.jsx
rename to src/features/message/Message.jsx
diff --git a/src/features/widgets/message/index.jsx b/src/features/message/index.jsx
similarity index 100%
rename from src/features/widgets/message/index.jsx
rename to src/features/message/index.jsx
diff --git a/src/features/widgets/message/message.scss b/src/features/message/message.scss
similarity index 100%
rename from src/features/widgets/message/message.scss
rename to src/features/message/message.scss
diff --git a/src/features/widgets/message/message_defaults.json b/src/features/message/message_defaults.json
similarity index 100%
rename from src/features/widgets/message/message_defaults.json
rename to src/features/message/message_defaults.json
diff --git a/src/features/widgets/message/options/MessageOptions.jsx b/src/features/message/options/MessageOptions.jsx
similarity index 100%
rename from src/features/widgets/message/options/MessageOptions.jsx
rename to src/features/message/options/MessageOptions.jsx
diff --git a/src/features/widgets/message/options/index.jsx b/src/features/message/options/index.jsx
similarity index 100%
rename from src/features/widgets/message/options/index.jsx
rename to src/features/message/options/index.jsx
diff --git a/src/features/modals/ErrorBoundary.jsx b/src/features/misc/modals/ErrorBoundary.jsx
similarity index 100%
rename from src/features/modals/ErrorBoundary.jsx
rename to src/features/misc/modals/ErrorBoundary.jsx
diff --git a/src/features/modals/Modals.jsx b/src/features/misc/modals/Modals.jsx
similarity index 96%
rename from src/features/modals/Modals.jsx
rename to src/features/misc/modals/Modals.jsx
index 9f5f423e..d1809861 100644
--- a/src/features/modals/Modals.jsx
+++ b/src/features/misc/modals/Modals.jsx
@@ -3,8 +3,8 @@ import { PureComponent } from 'react';
 import Modal from 'react-modal';
 
 import Main from './main/Main';
-import Navbar from '../widgets/navbar/Navbar';
-import Preview from '../helpers/preview/Preview';
+import Navbar from '../../navbar/Navbar';
+import Preview from '../../helpers/preview/Preview';
 
 import EventBus from 'utils/eventbus';
 
diff --git a/src/features/modals/main/Main.jsx b/src/features/misc/modals/main/Main.jsx
similarity index 100%
rename from src/features/modals/main/Main.jsx
rename to src/features/misc/modals/main/Main.jsx
diff --git a/src/features/modals/main/marketplace/components/Collection/Collection.jsx b/src/features/misc/modals/main/marketplace/components/Collection/Collection.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/components/Collection/Collection.jsx
rename to src/features/misc/modals/main/marketplace/components/Collection/Collection.jsx
diff --git a/src/features/modals/main/marketplace/components/Collection/index.jsx b/src/features/misc/modals/main/marketplace/components/Collection/index.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/components/Collection/index.jsx
rename to src/features/misc/modals/main/marketplace/components/Collection/index.jsx
diff --git a/src/features/modals/main/marketplace/components/Elements/Carousel/Carousel.jsx b/src/features/misc/modals/main/marketplace/components/Elements/Carousel/Carousel.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/components/Elements/Carousel/Carousel.jsx
rename to src/features/misc/modals/main/marketplace/components/Elements/Carousel/Carousel.jsx
diff --git a/src/features/modals/main/marketplace/components/Elements/Carousel/carousel.scss b/src/features/misc/modals/main/marketplace/components/Elements/Carousel/carousel.scss
similarity index 100%
rename from src/features/modals/main/marketplace/components/Elements/Carousel/carousel.scss
rename to src/features/misc/modals/main/marketplace/components/Elements/Carousel/carousel.scss
diff --git a/src/features/modals/main/marketplace/components/Elements/Carousel/index.jsx b/src/features/misc/modals/main/marketplace/components/Elements/Carousel/index.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/components/Elements/Carousel/index.jsx
rename to src/features/misc/modals/main/marketplace/components/Elements/Carousel/index.jsx
diff --git a/src/features/modals/main/marketplace/components/Elements/Lightbox/Lightbox.jsx b/src/features/misc/modals/main/marketplace/components/Elements/Lightbox/Lightbox.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/components/Elements/Lightbox/Lightbox.jsx
rename to src/features/misc/modals/main/marketplace/components/Elements/Lightbox/Lightbox.jsx
diff --git a/src/features/modals/main/marketplace/components/Elements/Lightbox/index.jsx b/src/features/misc/modals/main/marketplace/components/Elements/Lightbox/index.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/components/Elements/Lightbox/index.jsx
rename to src/features/misc/modals/main/marketplace/components/Elements/Lightbox/index.jsx
diff --git a/src/features/modals/main/marketplace/components/Elements/SideloadFailedModal/SideloadFailedModal.jsx b/src/features/misc/modals/main/marketplace/components/Elements/SideloadFailedModal/SideloadFailedModal.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/components/Elements/SideloadFailedModal/SideloadFailedModal.jsx
rename to src/features/misc/modals/main/marketplace/components/Elements/SideloadFailedModal/SideloadFailedModal.jsx
diff --git a/src/features/modals/main/marketplace/components/Elements/SideloadFailedModal/index.jsx b/src/features/misc/modals/main/marketplace/components/Elements/SideloadFailedModal/index.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/components/Elements/SideloadFailedModal/index.jsx
rename to src/features/misc/modals/main/marketplace/components/Elements/SideloadFailedModal/index.jsx
diff --git a/src/features/modals/main/marketplace/components/Elements/index.jsx b/src/features/misc/modals/main/marketplace/components/Elements/index.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/components/Elements/index.jsx
rename to src/features/misc/modals/main/marketplace/components/Elements/index.jsx
diff --git a/src/features/modals/main/marketplace/components/Items/Item.jsx b/src/features/misc/modals/main/marketplace/components/Items/Item.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/components/Items/Item.jsx
rename to src/features/misc/modals/main/marketplace/components/Items/Item.jsx
diff --git a/src/features/modals/main/marketplace/components/Items/Items.jsx b/src/features/misc/modals/main/marketplace/components/Items/Items.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/components/Items/Items.jsx
rename to src/features/misc/modals/main/marketplace/components/Items/Items.jsx
diff --git a/src/features/modals/main/marketplace/components/index.jsx b/src/features/misc/modals/main/marketplace/components/index.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/components/index.jsx
rename to src/features/misc/modals/main/marketplace/components/index.jsx
diff --git a/src/features/modals/main/marketplace/views/Added.jsx b/src/features/misc/modals/main/marketplace/views/Added.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/views/Added.jsx
rename to src/features/misc/modals/main/marketplace/views/Added.jsx
diff --git a/src/features/modals/main/marketplace/views/Browse.jsx b/src/features/misc/modals/main/marketplace/views/Browse.jsx
similarity index 99%
rename from src/features/modals/main/marketplace/views/Browse.jsx
rename to src/features/misc/modals/main/marketplace/views/Browse.jsx
index 4e26e14e..db11a781 100644
--- a/src/features/modals/main/marketplace/views/Browse.jsx
+++ b/src/features/misc/modals/main/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/modals/main/marketplace/views/Create.jsx b/src/features/misc/modals/main/marketplace/views/Create.jsx
similarity index 100%
rename from src/features/modals/main/marketplace/views/Create.jsx
rename to src/features/misc/modals/main/marketplace/views/Create.jsx
diff --git a/src/features/modals/main/scss/index.scss b/src/features/misc/modals/main/scss/index.scss
similarity index 100%
rename from src/features/modals/main/scss/index.scss
rename to src/features/misc/modals/main/scss/index.scss
diff --git a/src/features/modals/main/scss/marketplace/_main.scss b/src/features/misc/modals/main/scss/marketplace/_main.scss
similarity index 100%
rename from src/features/modals/main/scss/marketplace/_main.scss
rename to src/features/misc/modals/main/scss/marketplace/_main.scss
diff --git a/src/features/modals/main/scss/marketplace/modules/_buttons.scss b/src/features/misc/modals/main/scss/marketplace/modules/_buttons.scss
similarity index 100%
rename from src/features/modals/main/scss/marketplace/modules/_buttons.scss
rename to src/features/misc/modals/main/scss/marketplace/modules/_buttons.scss
diff --git a/src/features/modals/main/scss/marketplace/modules/_item.scss b/src/features/misc/modals/main/scss/marketplace/modules/_item.scss
similarity index 100%
rename from src/features/modals/main/scss/marketplace/modules/_item.scss
rename to src/features/misc/modals/main/scss/marketplace/modules/_item.scss
diff --git a/src/features/modals/main/scss/marketplace/modules/_lightbox.scss b/src/features/misc/modals/main/scss/marketplace/modules/_lightbox.scss
similarity index 100%
rename from src/features/modals/main/scss/marketplace/modules/_lightbox.scss
rename to src/features/misc/modals/main/scss/marketplace/modules/_lightbox.scss
diff --git a/src/features/modals/main/scss/modules/_links.scss b/src/features/misc/modals/main/scss/modules/_links.scss
similarity index 100%
rename from src/features/modals/main/scss/modules/_links.scss
rename to src/features/misc/modals/main/scss/modules/_links.scss
diff --git a/src/features/modals/main/scss/modules/_modalTabContent.scss b/src/features/misc/modals/main/scss/modules/_modalTabContent.scss
similarity index 100%
rename from src/features/modals/main/scss/modules/_modalTabContent.scss
rename to src/features/misc/modals/main/scss/modules/_modalTabContent.scss
diff --git a/src/features/modals/main/scss/modules/_navbar.scss b/src/features/misc/modals/main/scss/modules/_navbar.scss
similarity index 100%
rename from src/features/modals/main/scss/modules/_navbar.scss
rename to src/features/misc/modals/main/scss/modules/_navbar.scss
diff --git a/src/features/modals/main/scss/modules/_scrollbars.scss b/src/features/misc/modals/main/scss/modules/_scrollbars.scss
similarity index 100%
rename from src/features/modals/main/scss/modules/_scrollbars.scss
rename to src/features/misc/modals/main/scss/modules/_scrollbars.scss
diff --git a/src/features/modals/main/scss/modules/_sidebar.scss b/src/features/misc/modals/main/scss/modules/_sidebar.scss
similarity index 100%
rename from src/features/modals/main/scss/modules/_sidebar.scss
rename to src/features/misc/modals/main/scss/modules/_sidebar.scss
diff --git a/src/features/modals/main/scss/settings/_main.scss b/src/features/misc/modals/main/scss/settings/_main.scss
similarity index 100%
rename from src/features/modals/main/scss/settings/_main.scss
rename to src/features/misc/modals/main/scss/settings/_main.scss
diff --git a/src/features/modals/main/scss/settings/modules/_material-ui.scss b/src/features/misc/modals/main/scss/settings/modules/_material-ui.scss
similarity index 100%
rename from src/features/modals/main/scss/settings/modules/_material-ui.scss
rename to src/features/misc/modals/main/scss/settings/modules/_material-ui.scss
diff --git a/src/features/modals/main/scss/settings/modules/tabs/_about.scss b/src/features/misc/modals/main/scss/settings/modules/tabs/_about.scss
similarity index 100%
rename from src/features/modals/main/scss/settings/modules/tabs/_about.scss
rename to src/features/misc/modals/main/scss/settings/modules/tabs/_about.scss
diff --git a/src/features/modals/main/scss/settings/modules/tabs/_changelog.scss b/src/features/misc/modals/main/scss/settings/modules/tabs/_changelog.scss
similarity index 100%
rename from src/features/modals/main/scss/settings/modules/tabs/_changelog.scss
rename to src/features/misc/modals/main/scss/settings/modules/tabs/_changelog.scss
diff --git a/src/features/modals/main/scss/settings/modules/tabs/_order.scss b/src/features/misc/modals/main/scss/settings/modules/tabs/_order.scss
similarity index 100%
rename from src/features/modals/main/scss/settings/modules/tabs/_order.scss
rename to src/features/misc/modals/main/scss/settings/modules/tabs/_order.scss
diff --git a/src/features/modals/main/scss/settings/modules/tabs/_stats.scss b/src/features/misc/modals/main/scss/settings/modules/tabs/_stats.scss
similarity index 100%
rename from src/features/modals/main/scss/settings/modules/tabs/_stats.scss
rename to src/features/misc/modals/main/scss/settings/modules/tabs/_stats.scss
diff --git a/src/features/modals/main/settings/ResetModal.jsx b/src/features/misc/modals/main/settings/ResetModal.jsx
similarity index 100%
rename from src/features/modals/main/settings/ResetModal.jsx
rename to src/features/misc/modals/main/settings/ResetModal.jsx
diff --git a/src/features/modals/main/settings/sections/About.jsx b/src/features/misc/modals/main/settings/sections/About.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/About.jsx
rename to src/features/misc/modals/main/settings/sections/About.jsx
diff --git a/src/features/modals/main/settings/sections/Advanced.jsx b/src/features/misc/modals/main/settings/sections/Advanced.jsx
similarity index 98%
rename from src/features/modals/main/settings/sections/Advanced.jsx
rename to src/features/misc/modals/main/settings/sections/Advanced.jsx
index 9561aab4..0055083c 100644
--- a/src/features/modals/main/settings/sections/Advanced.jsx
+++ b/src/features/misc/modals/main/settings/sections/Advanced.jsx
@@ -15,7 +15,7 @@ import ResetModal from '../ResetModal';
 
 import { Header, Section, Row, Content, Action } from 'components/Layout/Settings';
 
-import time_zones from 'features/widgets/time/timezones.json';
+import time_zones from 'features/time/timezones.json';
 
 export default function AdvancedSettings() {
   const [resetModal, setResetModal] = useState(false);
diff --git a/src/features/modals/main/settings/sections/Appearance.jsx b/src/features/misc/modals/main/settings/sections/Appearance.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/Appearance.jsx
rename to src/features/misc/modals/main/settings/sections/Appearance.jsx
diff --git a/src/features/modals/main/settings/sections/Changelog.jsx b/src/features/misc/modals/main/settings/sections/Changelog.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/Changelog.jsx
rename to src/features/misc/modals/main/settings/sections/Changelog.jsx
diff --git a/src/features/modals/main/settings/sections/Date.jsx b/src/features/misc/modals/main/settings/sections/Date.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/Date.jsx
rename to src/features/misc/modals/main/settings/sections/Date.jsx
diff --git a/src/features/modals/main/settings/sections/Experimental.jsx b/src/features/misc/modals/main/settings/sections/Experimental.jsx
similarity index 89%
rename from src/features/modals/main/settings/sections/Experimental.jsx
rename to src/features/misc/modals/main/settings/sections/Experimental.jsx
index 19b1a4e9..a1482e87 100644
--- a/src/features/modals/main/settings/sections/Experimental.jsx
+++ b/src/features/misc/modals/main/settings/sections/Experimental.jsx
@@ -1,13 +1,17 @@
 import variables from 'config/variables';
 import { useState, memo } from 'react';
-import Checkbox from '../../../../../components/Form/Settings/Checkbox/Checkbox';
-import Slider from '../../../../../components/Form/Settings/Slider/Slider';
+import Checkbox from '../../../../../../components/Form/Settings/Checkbox/Checkbox';
+import Slider from '../../../../../../components/Form/Settings/Slider/Slider';
 import { TextField } from '@mui/material';
 
 import EventBus from 'utils/eventbus';
 import values from 'utils/data/slider_values.json';
 
-import { Row, Content, Action } from '../../../../../components/Layout/Settings/Item/SettingsItem';
+import {
+  Row,
+  Content,
+  Action,
+} from '../../../../../../components/Layout/Settings/Item/SettingsItem';
 
 function ExperimentalSettings() {
   const [eventType, setEventType] = useState();
diff --git a/src/features/modals/main/settings/sections/Language.jsx b/src/features/misc/modals/main/settings/sections/Language.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/Language.jsx
rename to src/features/misc/modals/main/settings/sections/Language.jsx
diff --git a/src/features/modals/main/settings/sections/Overview.jsx b/src/features/misc/modals/main/settings/sections/Overview.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/Overview.jsx
rename to src/features/misc/modals/main/settings/sections/Overview.jsx
diff --git a/src/features/modals/main/settings/sections/QuickLinks.jsx b/src/features/misc/modals/main/settings/sections/QuickLinks.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/QuickLinks.jsx
rename to src/features/misc/modals/main/settings/sections/QuickLinks.jsx
diff --git a/src/features/modals/main/settings/sections/Stats.jsx b/src/features/misc/modals/main/settings/sections/Stats.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/Stats.jsx
rename to src/features/misc/modals/main/settings/sections/Stats.jsx
diff --git a/src/features/modals/main/settings/sections/overview_skeletons/Clock.jsx b/src/features/misc/modals/main/settings/sections/overview_skeletons/Clock.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/overview_skeletons/Clock.jsx
rename to src/features/misc/modals/main/settings/sections/overview_skeletons/Clock.jsx
diff --git a/src/features/modals/main/settings/sections/overview_skeletons/Date.jsx b/src/features/misc/modals/main/settings/sections/overview_skeletons/Date.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/overview_skeletons/Date.jsx
rename to src/features/misc/modals/main/settings/sections/overview_skeletons/Date.jsx
diff --git a/src/features/modals/main/settings/sections/overview_skeletons/Greeting.jsx b/src/features/misc/modals/main/settings/sections/overview_skeletons/Greeting.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/overview_skeletons/Greeting.jsx
rename to src/features/misc/modals/main/settings/sections/overview_skeletons/Greeting.jsx
diff --git a/src/features/modals/main/settings/sections/overview_skeletons/Message.jsx b/src/features/misc/modals/main/settings/sections/overview_skeletons/Message.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/overview_skeletons/Message.jsx
rename to src/features/misc/modals/main/settings/sections/overview_skeletons/Message.jsx
diff --git a/src/features/modals/main/settings/sections/overview_skeletons/QuickLinks.jsx b/src/features/misc/modals/main/settings/sections/overview_skeletons/QuickLinks.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/overview_skeletons/QuickLinks.jsx
rename to src/features/misc/modals/main/settings/sections/overview_skeletons/QuickLinks.jsx
diff --git a/src/features/modals/main/settings/sections/overview_skeletons/Quote.jsx b/src/features/misc/modals/main/settings/sections/overview_skeletons/Quote.jsx
similarity index 100%
rename from src/features/modals/main/settings/sections/overview_skeletons/Quote.jsx
rename to src/features/misc/modals/main/settings/sections/overview_skeletons/Quote.jsx
diff --git a/src/features/modals/main/tabs/Addons.jsx b/src/features/misc/modals/main/tabs/Addons.jsx
similarity index 100%
rename from src/features/modals/main/tabs/Addons.jsx
rename to src/features/misc/modals/main/tabs/Addons.jsx
diff --git a/src/features/modals/main/tabs/Marketplace.jsx b/src/features/misc/modals/main/tabs/Marketplace.jsx
similarity index 100%
rename from src/features/modals/main/tabs/Marketplace.jsx
rename to src/features/misc/modals/main/tabs/Marketplace.jsx
diff --git a/src/features/modals/main/tabs/Settings.jsx b/src/features/misc/modals/main/tabs/Settings.jsx
similarity index 83%
rename from src/features/modals/main/tabs/Settings.jsx
rename to src/features/misc/modals/main/tabs/Settings.jsx
index ae9c2312..151180e1 100644
--- a/src/features/modals/main/tabs/Settings.jsx
+++ b/src/features/misc/modals/main/tabs/Settings.jsx
@@ -4,16 +4,16 @@ import { memo } from 'react';
 import Tabs from './backend/Tabs';
 
 import Overview from '../settings/sections/Overview';
-import { NavbarOptions } from 'features/widgets/navbar';
-import { GreetingOptions } from 'features/widgets/greeting';
-import { TimeOptions } from 'features/widgets/time';
-import { QuickLinksOptions } from 'features/widgets/quicklinks';
-import { QuoteOptions } from 'features/widgets/quote';
+import { NavbarOptions } from 'features/navbar';
+import { GreetingOptions } from 'features/greeting';
+import { TimeOptions } from 'features/time';
+import { QuickLinksOptions } from 'features/quicklinks';
+import { QuoteOptions } from 'features/quote';
 import Date from '../settings/sections/Date';
-import { MessageOptions } from 'features/widgets/message';
-import Background from '../settings/sections/background/Background';
-import { SearchOptions } from 'features/widgets/search';
-import { WeatherOptions } from 'features/widgets/weather';
+import { MessageOptions } from 'features/message';
+import { BackgroundOptions } from 'features/background';
+import { SearchOptions } from 'features/search';
+import { WeatherOptions } from 'features/weather';
 import Appearance from '../settings/sections/Appearance';
 import Language from '../settings/sections/Language';
 import Advanced from '../settings/sections/Advanced';
@@ -50,7 +50,7 @@ const sections = [
   {
     label: 'modals.main.settings.sections.background.title',
     name: 'background',
-    component: Background,
+    component: BackgroundOptions,
   },
   { label: 'modals.main.settings.sections.search.title', name: 'search', component: SearchOptions },
   {
diff --git a/src/features/modals/main/tabs/backend/Tab.jsx b/src/features/misc/modals/main/tabs/backend/Tab.jsx
similarity index 100%
rename from src/features/modals/main/tabs/backend/Tab.jsx
rename to src/features/misc/modals/main/tabs/backend/Tab.jsx
diff --git a/src/features/modals/main/tabs/backend/Tabs.jsx b/src/features/misc/modals/main/tabs/backend/Tabs.jsx
similarity index 91%
rename from src/features/modals/main/tabs/backend/Tabs.jsx
rename to src/features/misc/modals/main/tabs/backend/Tabs.jsx
index 79280185..0c2f9f6e 100644
--- a/src/features/modals/main/tabs/backend/Tabs.jsx
+++ b/src/features/misc/modals/main/tabs/backend/Tabs.jsx
@@ -92,23 +92,25 @@ class Tabs extends PureComponent {
         </div>
         <div className="modalTabContent">
           <div className="modalNavbar">
-            {navbarButtons.map(({ tab, icon }) => (
+            {navbarButtons.map(({ tab, icon }, index) => (
               <Button
                 type="navigation"
                 onClick={() => this.props.changeTab(tab)}
                 icon={icon}
                 label={variables.getMessage(`modals.main.navbar.${tab}`)}
                 active={this.props.current === tab}
-                key={tab}
+                key={`${tab}-${index}`}
               />
             ))}
           </div>
-          {this.props.children.map((tab) => {
+          {this.props.children.map((tab, index) => {
             if (tab.props.label !== this.state.currentTab) {
               return undefined;
             }
 
-            return <ErrorBoundary>{tab.props.children}</ErrorBoundary>;
+            return (
+              <ErrorBoundary key={`error-boundary-${index}`}>{tab.props.children}</ErrorBoundary>
+            );
           })}
         </div>
       </div>
diff --git a/src/features/modals/welcome/Sections/ChooseLanguage.jsx b/src/features/misc/modals/welcome/Sections/ChooseLanguage.jsx
similarity index 100%
rename from src/features/modals/welcome/Sections/ChooseLanguage.jsx
rename to src/features/misc/modals/welcome/Sections/ChooseLanguage.jsx
diff --git a/src/features/modals/welcome/Sections/Final.jsx b/src/features/misc/modals/welcome/Sections/Final.jsx
similarity index 100%
rename from src/features/modals/welcome/Sections/Final.jsx
rename to src/features/misc/modals/welcome/Sections/Final.jsx
diff --git a/src/features/modals/welcome/Sections/ImportSettings.jsx b/src/features/misc/modals/welcome/Sections/ImportSettings.jsx
similarity index 100%
rename from src/features/modals/welcome/Sections/ImportSettings.jsx
rename to src/features/misc/modals/welcome/Sections/ImportSettings.jsx
diff --git a/src/features/modals/welcome/Sections/Intro.jsx b/src/features/misc/modals/welcome/Sections/Intro.jsx
similarity index 100%
rename from src/features/modals/welcome/Sections/Intro.jsx
rename to src/features/misc/modals/welcome/Sections/Intro.jsx
diff --git a/src/features/modals/welcome/Sections/PrivacyOptions.jsx b/src/features/misc/modals/welcome/Sections/PrivacyOptions.jsx
similarity index 100%
rename from src/features/modals/welcome/Sections/PrivacyOptions.jsx
rename to src/features/misc/modals/welcome/Sections/PrivacyOptions.jsx
diff --git a/src/features/modals/welcome/Sections/StyleSelection.jsx b/src/features/misc/modals/welcome/Sections/StyleSelection.jsx
similarity index 100%
rename from src/features/modals/welcome/Sections/StyleSelection.jsx
rename to src/features/misc/modals/welcome/Sections/StyleSelection.jsx
diff --git a/src/features/modals/welcome/Sections/ThemeSelection.jsx b/src/features/misc/modals/welcome/Sections/ThemeSelection.jsx
similarity index 100%
rename from src/features/modals/welcome/Sections/ThemeSelection.jsx
rename to src/features/misc/modals/welcome/Sections/ThemeSelection.jsx
diff --git a/src/features/modals/welcome/Sections/index.jsx b/src/features/misc/modals/welcome/Sections/index.jsx
similarity index 100%
rename from src/features/modals/welcome/Sections/index.jsx
rename to src/features/misc/modals/welcome/Sections/index.jsx
diff --git a/src/features/modals/welcome/Welcome.jsx b/src/features/misc/modals/welcome/Welcome.jsx
similarity index 100%
rename from src/features/modals/welcome/Welcome.jsx
rename to src/features/misc/modals/welcome/Welcome.jsx
diff --git a/src/features/modals/welcome/WelcomeSections.jsx b/src/features/misc/modals/welcome/WelcomeSections.jsx
similarity index 100%
rename from src/features/modals/welcome/WelcomeSections.jsx
rename to src/features/misc/modals/welcome/WelcomeSections.jsx
diff --git a/src/features/modals/welcome/components/Elements/AsideImage/AsideImage.jsx b/src/features/misc/modals/welcome/components/Elements/AsideImage/AsideImage.jsx
similarity index 100%
rename from src/features/modals/welcome/components/Elements/AsideImage/AsideImage.jsx
rename to src/features/misc/modals/welcome/components/Elements/AsideImage/AsideImage.jsx
diff --git a/src/features/modals/welcome/components/Elements/AsideImage/index.jsx b/src/features/misc/modals/welcome/components/Elements/AsideImage/index.jsx
similarity index 100%
rename from src/features/modals/welcome/components/Elements/AsideImage/index.jsx
rename to src/features/misc/modals/welcome/components/Elements/AsideImage/index.jsx
diff --git a/src/features/modals/welcome/components/Elements/ProgressBar/ProgressBar.jsx b/src/features/misc/modals/welcome/components/Elements/ProgressBar/ProgressBar.jsx
similarity index 100%
rename from src/features/modals/welcome/components/Elements/ProgressBar/ProgressBar.jsx
rename to src/features/misc/modals/welcome/components/Elements/ProgressBar/ProgressBar.jsx
diff --git a/src/features/modals/welcome/components/Elements/ProgressBar/index.jsx b/src/features/misc/modals/welcome/components/Elements/ProgressBar/index.jsx
similarity index 100%
rename from src/features/modals/welcome/components/Elements/ProgressBar/index.jsx
rename to src/features/misc/modals/welcome/components/Elements/ProgressBar/index.jsx
diff --git a/src/features/modals/welcome/components/Elements/index.jsx b/src/features/misc/modals/welcome/components/Elements/index.jsx
similarity index 100%
rename from src/features/modals/welcome/components/Elements/index.jsx
rename to src/features/misc/modals/welcome/components/Elements/index.jsx
diff --git a/src/features/modals/welcome/components/Layout/Content.jsx b/src/features/misc/modals/welcome/components/Layout/Content.jsx
similarity index 100%
rename from src/features/modals/welcome/components/Layout/Content.jsx
rename to src/features/misc/modals/welcome/components/Layout/Content.jsx
diff --git a/src/features/modals/welcome/components/Layout/Header.jsx b/src/features/misc/modals/welcome/components/Layout/Header.jsx
similarity index 100%
rename from src/features/modals/welcome/components/Layout/Header.jsx
rename to src/features/misc/modals/welcome/components/Layout/Header.jsx
diff --git a/src/features/modals/welcome/components/Layout/Layout.jsx b/src/features/misc/modals/welcome/components/Layout/Layout.jsx
similarity index 100%
rename from src/features/modals/welcome/components/Layout/Layout.jsx
rename to src/features/misc/modals/welcome/components/Layout/Layout.jsx
diff --git a/src/features/modals/welcome/components/Layout/Panel.jsx b/src/features/misc/modals/welcome/components/Layout/Panel.jsx
similarity index 100%
rename from src/features/modals/welcome/components/Layout/Panel.jsx
rename to src/features/misc/modals/welcome/components/Layout/Panel.jsx
diff --git a/src/features/modals/welcome/components/Layout/Wrapper.jsx b/src/features/misc/modals/welcome/components/Layout/Wrapper.jsx
similarity index 100%
rename from src/features/modals/welcome/components/Layout/Wrapper.jsx
rename to src/features/misc/modals/welcome/components/Layout/Wrapper.jsx
diff --git a/src/features/modals/welcome/components/Layout/index.jsx b/src/features/misc/modals/welcome/components/Layout/index.jsx
similarity index 100%
rename from src/features/modals/welcome/components/Layout/index.jsx
rename to src/features/misc/modals/welcome/components/Layout/index.jsx
diff --git a/src/features/modals/welcome/components/index.jsx b/src/features/misc/modals/welcome/components/index.jsx
similarity index 100%
rename from src/features/modals/welcome/components/index.jsx
rename to src/features/misc/modals/welcome/components/index.jsx
diff --git a/src/features/modals/welcome/welcome.scss b/src/features/misc/modals/welcome/welcome.scss
similarity index 100%
rename from src/features/modals/welcome/welcome.scss
rename to src/features/misc/modals/welcome/welcome.scss
diff --git a/src/features/widgets/Widgets.jsx b/src/features/misc/views/Widgets.jsx
similarity index 87%
rename from src/features/widgets/Widgets.jsx
rename to src/features/misc/views/Widgets.jsx
index e61499a7..a2bb889f 100644
--- a/src/features/widgets/Widgets.jsx
+++ b/src/features/misc/views/Widgets.jsx
@@ -1,12 +1,12 @@
 import { PureComponent, Fragment, Suspense, lazy } from 'react';
 
-import Clock from './time/Clock';
-import Greeting from './greeting/Greeting';
-import Quote from './quote/Quote';
-import Search from './search/Search';
-import QuickLinks from './quicklinks/QuickLinks';
-import Date from './time/Date';
-import Message from './message/Message';
+import Clock from '../../time/Clock';
+import Greeting from '../../greeting/Greeting';
+import Quote from '../../quote/Quote';
+import Search from '../../search/Search';
+import QuickLinks from '../../quicklinks/QuickLinks';
+import Date from '../../time/Date';
+import Message from '../../message/Message';
 import { WidgetsLayout } from 'components/Layout';
 
 import EventBus from 'utils/eventbus';
@@ -15,7 +15,7 @@ import EventBus from 'utils/eventbus';
 // since we're using react-icons this might not be accurate,
 // however, when we used the original module https://bundlephobia.com/package/weather-icons-react@1.2.0
 // as seen here it is ridiculously large
-const Weather = lazy(() => import('./weather/Weather'));
+const Weather = lazy(() => import('../../weather/Weather'));
 
 export default class Widgets extends PureComponent {
   online = localStorage.getItem('offlineMode') === 'false';
diff --git a/src/features/widgets/navbar/Apps.jsx b/src/features/navbar/Apps.jsx
similarity index 100%
rename from src/features/widgets/navbar/Apps.jsx
rename to src/features/navbar/Apps.jsx
diff --git a/src/features/widgets/navbar/Navbar.jsx b/src/features/navbar/Navbar.jsx
similarity index 100%
rename from src/features/widgets/navbar/Navbar.jsx
rename to src/features/navbar/Navbar.jsx
diff --git a/src/features/widgets/navbar/Notes.jsx b/src/features/navbar/Notes.jsx
similarity index 100%
rename from src/features/widgets/navbar/Notes.jsx
rename to src/features/navbar/Notes.jsx
diff --git a/src/features/widgets/navbar/Todo.jsx b/src/features/navbar/Todo.jsx
similarity index 100%
rename from src/features/widgets/navbar/Todo.jsx
rename to src/features/navbar/Todo.jsx
diff --git a/src/features/widgets/navbar/index.jsx b/src/features/navbar/index.jsx
similarity index 100%
rename from src/features/widgets/navbar/index.jsx
rename to src/features/navbar/index.jsx
diff --git a/src/features/widgets/navbar/options/NavbarOptions.jsx b/src/features/navbar/options/NavbarOptions.jsx
similarity index 99%
rename from src/features/widgets/navbar/options/NavbarOptions.jsx
rename to src/features/navbar/options/NavbarOptions.jsx
index 2372d253..d31aad1f 100644
--- a/src/features/widgets/navbar/options/NavbarOptions.jsx
+++ b/src/features/navbar/options/NavbarOptions.jsx
@@ -13,7 +13,7 @@ import { Button } from 'components/Elements';
 import { Row, Content, Action } from 'components/Layout/Settings';
 import { Header } from 'components/Layout/Settings';
 import { getTitleFromUrl, isValidUrl } from 'utils/links';
-import { QuickLinks } from 'features/widgets/quicklinks';
+import { QuickLinks } from 'features/quicklinks';
 
 function NavbarOptions() {
   const [showRefreshOptions, setShowRefreshOptions] = useState(
diff --git a/src/features/widgets/navbar/options/index.jsx b/src/features/navbar/options/index.jsx
similarity index 100%
rename from src/features/widgets/navbar/options/index.jsx
rename to src/features/navbar/options/index.jsx
diff --git a/src/features/widgets/navbar/scss/_apps.scss b/src/features/navbar/scss/_apps.scss
similarity index 100%
rename from src/features/widgets/navbar/scss/_apps.scss
rename to src/features/navbar/scss/_apps.scss
diff --git a/src/features/widgets/navbar/scss/_notes.scss b/src/features/navbar/scss/_notes.scss
similarity index 100%
rename from src/features/widgets/navbar/scss/_notes.scss
rename to src/features/navbar/scss/_notes.scss
diff --git a/src/features/widgets/navbar/scss/_todo.scss b/src/features/navbar/scss/_todo.scss
similarity index 100%
rename from src/features/widgets/navbar/scss/_todo.scss
rename to src/features/navbar/scss/_todo.scss
diff --git a/src/features/widgets/navbar/scss/index.scss b/src/features/navbar/scss/index.scss
similarity index 100%
rename from src/features/widgets/navbar/scss/index.scss
rename to src/features/navbar/scss/index.scss
diff --git a/src/features/widgets/quicklinks/QuickLinks.jsx b/src/features/quicklinks/QuickLinks.jsx
similarity index 100%
rename from src/features/widgets/quicklinks/QuickLinks.jsx
rename to src/features/quicklinks/QuickLinks.jsx
diff --git a/src/features/widgets/quicklinks/index.jsx b/src/features/quicklinks/index.jsx
similarity index 100%
rename from src/features/widgets/quicklinks/index.jsx
rename to src/features/quicklinks/index.jsx
diff --git a/src/features/widgets/quicklinks/options/QuickLink.jsx b/src/features/quicklinks/options/QuickLink.jsx
similarity index 100%
rename from src/features/widgets/quicklinks/options/QuickLink.jsx
rename to src/features/quicklinks/options/QuickLink.jsx
diff --git a/src/features/widgets/quicklinks/options/QuickLinksOptions.jsx b/src/features/quicklinks/options/QuickLinksOptions.jsx
similarity index 100%
rename from src/features/widgets/quicklinks/options/QuickLinksOptions.jsx
rename to src/features/quicklinks/options/QuickLinksOptions.jsx
diff --git a/src/features/widgets/quicklinks/options/index.jsx b/src/features/quicklinks/options/index.jsx
similarity index 100%
rename from src/features/widgets/quicklinks/options/index.jsx
rename to src/features/quicklinks/options/index.jsx
diff --git a/src/features/widgets/quicklinks/quicklinks.scss b/src/features/quicklinks/quicklinks.scss
similarity index 100%
rename from src/features/widgets/quicklinks/quicklinks.scss
rename to src/features/quicklinks/quicklinks.scss
diff --git a/src/features/widgets/quote/Quote.jsx b/src/features/quote/Quote.jsx
similarity index 100%
rename from src/features/widgets/quote/Quote.jsx
rename to src/features/quote/Quote.jsx
diff --git a/src/features/widgets/quote/index.jsx b/src/features/quote/index.jsx
similarity index 100%
rename from src/features/widgets/quote/index.jsx
rename to src/features/quote/index.jsx
diff --git a/src/features/widgets/quote/offline_quotes.json b/src/features/quote/offline_quotes.json
similarity index 100%
rename from src/features/widgets/quote/offline_quotes.json
rename to src/features/quote/offline_quotes.json
diff --git a/src/features/widgets/quote/options/QuoteOptions.jsx b/src/features/quote/options/QuoteOptions.jsx
similarity index 100%
rename from src/features/widgets/quote/options/QuoteOptions.jsx
rename to src/features/quote/options/QuoteOptions.jsx
diff --git a/src/features/widgets/quote/options/index.jsx b/src/features/quote/options/index.jsx
similarity index 100%
rename from src/features/widgets/quote/options/index.jsx
rename to src/features/quote/options/index.jsx
diff --git a/src/features/widgets/quote/quote.scss b/src/features/quote/quote.scss
similarity index 100%
rename from src/features/widgets/quote/quote.scss
rename to src/features/quote/quote.scss
diff --git a/src/features/widgets/search/Search.jsx b/src/features/search/Search.jsx
similarity index 98%
rename from src/features/widgets/search/Search.jsx
rename to src/features/search/Search.jsx
index 6738cdfb..bf37a1db 100644
--- a/src/features/widgets/search/Search.jsx
+++ b/src/features/search/Search.jsx
@@ -5,13 +5,13 @@ import { BsGoogle } from 'react-icons/bs';
 import { SiDuckduckgo, SiMicrosoftbing, SiYahoo, SiBaidu } from 'react-icons/si';
 import { FaYandex } from 'react-icons/fa';
 import { Tooltip } from 'components/Elements';
-import AutocompleteInput from 'features/helpers/autocomplete/Autocomplete';
+import { Autocomplete as AutocompleteInput } from './components/autocomplete';
 
 import EventBus from 'utils/eventbus';
 
 import './search.scss';
 
-import searchEngines from 'features/widgets/search/search_engines.json';
+import searchEngines from './search_engines.json';
 
 export default class Search extends PureComponent {
   constructor() {
diff --git a/src/features/helpers/autocomplete/Autocomplete.jsx b/src/features/search/components/autocomplete/Autocomplete.jsx
similarity index 97%
rename from src/features/helpers/autocomplete/Autocomplete.jsx
rename to src/features/search/components/autocomplete/Autocomplete.jsx
index 54adbff3..e6d40753 100644
--- a/src/features/helpers/autocomplete/Autocomplete.jsx
+++ b/src/features/search/components/autocomplete/Autocomplete.jsx
@@ -92,4 +92,4 @@ class Autocomplete extends PureComponent {
   }
 }
 
-export default Autocomplete;
+export { Autocomplete as default, Autocomplete };
diff --git a/src/features/helpers/autocomplete/autocomplete.scss b/src/features/search/components/autocomplete/autocomplete.scss
similarity index 100%
rename from src/features/helpers/autocomplete/autocomplete.scss
rename to src/features/search/components/autocomplete/autocomplete.scss
diff --git a/src/features/search/components/autocomplete/index.jsx b/src/features/search/components/autocomplete/index.jsx
new file mode 100644
index 00000000..a796c54c
--- /dev/null
+++ b/src/features/search/components/autocomplete/index.jsx
@@ -0,0 +1 @@
+export * from './Autocomplete';
diff --git a/src/features/widgets/search/index.jsx b/src/features/search/index.jsx
similarity index 100%
rename from src/features/widgets/search/index.jsx
rename to src/features/search/index.jsx
diff --git a/src/features/widgets/search/options/SearchOptions.jsx b/src/features/search/options/SearchOptions.jsx
similarity index 97%
rename from src/features/widgets/search/options/SearchOptions.jsx
rename to src/features/search/options/SearchOptions.jsx
index bb13527c..5a59fec1 100644
--- a/src/features/widgets/search/options/SearchOptions.jsx
+++ b/src/features/search/options/SearchOptions.jsx
@@ -8,7 +8,7 @@ import { Dropdown, Checkbox } from 'components/Form/Settings';
 
 import EventBus from 'utils/eventbus';
 
-import searchEngines from 'features/widgets/search/search_engines.json';
+import searchEngines from '../search_engines.json';
 
 class SearchOptions extends PureComponent {
   constructor() {
@@ -171,4 +171,4 @@ class SearchOptions extends PureComponent {
   }
 }
 
-export { SearchOptions as default, SearchOptions };
\ No newline at end of file
+export { SearchOptions as default, SearchOptions };
diff --git a/src/features/widgets/search/options/index.jsx b/src/features/search/options/index.jsx
similarity index 100%
rename from src/features/widgets/search/options/index.jsx
rename to src/features/search/options/index.jsx
diff --git a/src/features/widgets/search/search.scss b/src/features/search/search.scss
similarity index 100%
rename from src/features/widgets/search/search.scss
rename to src/features/search/search.scss
diff --git a/src/features/widgets/search/search_engines.json b/src/features/search/search_engines.json
similarity index 100%
rename from src/features/widgets/search/search_engines.json
rename to src/features/search/search_engines.json
diff --git a/src/features/widgets/time/Clock.jsx b/src/features/time/Clock.jsx
similarity index 100%
rename from src/features/widgets/time/Clock.jsx
rename to src/features/time/Clock.jsx
diff --git a/src/features/widgets/time/Date.jsx b/src/features/time/Date.jsx
similarity index 100%
rename from src/features/widgets/time/Date.jsx
rename to src/features/time/Date.jsx
diff --git a/src/features/widgets/time/clock.scss b/src/features/time/clock.scss
similarity index 100%
rename from src/features/widgets/time/clock.scss
rename to src/features/time/clock.scss
diff --git a/src/features/widgets/time/date.scss b/src/features/time/date.scss
similarity index 100%
rename from src/features/widgets/time/date.scss
rename to src/features/time/date.scss
diff --git a/src/features/time/index.jsx b/src/features/time/index.jsx
new file mode 100644
index 00000000..5f30ef38
--- /dev/null
+++ b/src/features/time/index.jsx
@@ -0,0 +1 @@
+export * from './options';
diff --git a/src/features/widgets/time/options/TimeOptions.jsx b/src/features/time/options/TimeOptions.jsx
similarity index 100%
rename from src/features/widgets/time/options/TimeOptions.jsx
rename to src/features/time/options/TimeOptions.jsx
diff --git a/src/features/widgets/time/options/index.jsx b/src/features/time/options/index.jsx
similarity index 100%
rename from src/features/widgets/time/options/index.jsx
rename to src/features/time/options/index.jsx
diff --git a/src/features/widgets/time/timezones.json b/src/features/time/timezones.json
similarity index 100%
rename from src/features/widgets/time/timezones.json
rename to src/features/time/timezones.json
diff --git a/src/features/widgets/weather/Weather.jsx b/src/features/weather/Weather.jsx
similarity index 100%
rename from src/features/widgets/weather/Weather.jsx
rename to src/features/weather/Weather.jsx
diff --git a/src/features/widgets/weather/api/getWeather.js b/src/features/weather/api/getWeather.js
similarity index 100%
rename from src/features/widgets/weather/api/getWeather.js
rename to src/features/weather/api/getWeather.js
diff --git a/src/features/widgets/weather/components/Expanded.jsx b/src/features/weather/components/Expanded.jsx
similarity index 100%
rename from src/features/widgets/weather/components/Expanded.jsx
rename to src/features/weather/components/Expanded.jsx
diff --git a/src/features/widgets/weather/components/WeatherIcon.jsx b/src/features/weather/components/WeatherIcon.jsx
similarity index 100%
rename from src/features/widgets/weather/components/WeatherIcon.jsx
rename to src/features/weather/components/WeatherIcon.jsx
diff --git a/src/features/widgets/weather/components/WindDirectionIcon.jsx b/src/features/weather/components/WindDirectionIcon.jsx
similarity index 100%
rename from src/features/widgets/weather/components/WindDirectionIcon.jsx
rename to src/features/weather/components/WindDirectionIcon.jsx
diff --git a/src/features/widgets/weather/index.jsx b/src/features/weather/index.jsx
similarity index 100%
rename from src/features/widgets/weather/index.jsx
rename to src/features/weather/index.jsx
diff --git a/src/features/widgets/weather/options/WeatherOptions.jsx b/src/features/weather/options/WeatherOptions.jsx
similarity index 100%
rename from src/features/widgets/weather/options/WeatherOptions.jsx
rename to src/features/weather/options/WeatherOptions.jsx
diff --git a/src/features/widgets/weather/options/index.jsx b/src/features/weather/options/index.jsx
similarity index 100%
rename from src/features/widgets/weather/options/index.jsx
rename to src/features/weather/options/index.jsx
diff --git a/src/features/widgets/weather/weather.scss b/src/features/weather/weather.scss
similarity index 97%
rename from src/features/widgets/weather/weather.scss
rename to src/features/weather/weather.scss
index b630adfe..a6f5a303 100644
--- a/src/features/widgets/weather/weather.scss
+++ b/src/features/weather/weather.scss
@@ -49,9 +49,6 @@
   flex-flow: column;
   justify-content: space-between;
   padding: 25px;
-  @include themed() {
-    border-bottom: 1px solid t($btn-backgroundHover);
-  }
 
   div {
     align-items: center;
@@ -90,6 +87,9 @@
 .weatherExpandedInfo {
   padding: 0 25px 25px 25px;
   text-align: left;
+  @include themed() {
+    border-top: 1px solid t($btn-backgroundHover);
+  }
 }
 
 .weatherExpandedInfoItems {