diff --git a/monkey/monkey_island/cc/ui/src/components/attack/ConfigMatrixComponent.js b/monkey/monkey_island/cc/ui/src/components/attack/ConfigMatrixComponent.js
index 75c2a2106..ff9a11766 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/ConfigMatrixComponent.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/ConfigMatrixComponent.js
@@ -4,7 +4,7 @@ import Tooltip from 'react-tooltip-lite'
 import AuthComponent from '../AuthComponent';
 import ReactTable from 'react-table';
 import 'filepond/dist/filepond.min.css';
-import '../../styles/Tooltip.scss';
+import '../../styles/components/Tooltip.scss';
 import {Col} from 'react-bootstrap';
 
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/LoginPage.js b/monkey/monkey_island/cc/ui/src/components/pages/LoginPage.js
index 04e1ab506..f617036a6 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/LoginPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/LoginPage.js
@@ -3,7 +3,7 @@ import {Button, Col, Container, Form, Row} from 'react-bootstrap';
 
 import AuthService from '../../services/AuthService';
 import Particles from "react-particles-js";
-import {particleParams} from "../../styles/particle-component/AuthPageParams";
+import {particleParams} from "../../styles/components/particle-component/AuthPageParams";
 import monkeyGeneral from "../../images/militant-monkey.svg";
 
 class LoginPageComponent extends React.Component {
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js b/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
index 11c9174e9..9ca26ae22 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
@@ -8,7 +8,7 @@ import PreviewPaneComponent from 'components/map/preview-pane/PreviewPane';
 import {ReactiveGraph} from 'components/reactive-graph/ReactiveGraph';
 import {getOptions, edgeGroupToColor} from 'components/map/MapOptions';
 import AuthComponent from '../AuthComponent';
-import '../../styles/Map.scss';
+import '../../styles/components/Map.scss';
 import {faInfoCircle} from "@fortawesome/free-solid-svg-icons/faInfoCircle";
 
 class MapPageComponent extends AuthComponent {
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/NotFoundPage.js b/monkey/monkey_island/cc/ui/src/components/pages/NotFoundPage.js
index 9696fa521..5cd341574 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/NotFoundPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/NotFoundPage.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import '../../styles/NotFoundPage.scss';
+import '../../styles/pages/NotFoundPage.scss';
 
 import monkeyDetective from '../../images/detective-monkey.svg';
 
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/RegisterPage.js b/monkey/monkey_island/cc/ui/src/components/pages/RegisterPage.js
index 62ff0e170..9d7d6dd80 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/RegisterPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/RegisterPage.js
@@ -3,7 +3,7 @@ import {Row, Col, Container, Form, Button} from 'react-bootstrap';
 import Particles from 'react-particles-js';
 
 import AuthService from '../../services/AuthService';
-import {particleParams} from '../../styles/particle-component/AuthPageParams';
+import {particleParams} from '../../styles/components/particle-component/AuthPageParams';
 import monkeyDetective from '../../images/detective-monkey.svg';
 
 class RegisterPageComponent extends React.Component {
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/StartOverPage.js b/monkey/monkey_island/cc/ui/src/components/pages/StartOverPage.js
index cf38b56cb..5c665bd0e 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/StartOverPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/StartOverPage.js
@@ -3,7 +3,7 @@ import {Col, Button} from 'react-bootstrap';
 import {Link} from 'react-router-dom';
 import AuthComponent from '../AuthComponent';
 import StartOverModal from '../ui-components/StartOverModal';
-import '../../styles/StartOverPage.scss';
+import '../../styles/pages/StartOverPage.scss';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import {faInfoCircle} from "@fortawesome/free-solid-svg-icons/faInfoCircle";
 import {faCheck} from "@fortawesome/free-solid-svg-icons/faCheck";
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/TelemetryPage.js b/monkey/monkey_island/cc/ui/src/components/pages/TelemetryPage.js
index f5f8b10d4..2d75272a3 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/TelemetryPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/TelemetryPage.js
@@ -6,7 +6,7 @@ import AuthComponent from '../AuthComponent';
 import download from 'downloadjs';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 
-import '../../styles/TelemetryPage.scss';
+import '../../styles/pages/TelemetryPage.scss';
 import {faDownload} from "@fortawesome/free-solid-svg-icons/faDownload";
 
 const renderJson = (val) => <JSONTree data={val} level={1} theme="eighties" invertTheme={true}/>;
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js b/monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js
index 5c066034c..3372d1d33 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/AttackReport.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import {Col, Button} from 'react-bootstrap';
-import '../../styles/Collapse.scss';
+import '../../styles/components/Collapse.scss';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import {faCircle} from '@fortawesome/free-solid-svg-icons/faCircle';
 import {faRadiation} from '@fortawesome/free-solid-svg-icons/faRadiation';
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/attack/ReportMatrixComponent.js b/monkey/monkey_island/cc/ui/src/components/report-components/attack/ReportMatrixComponent.js
index c2d4b0d3f..a110da5ea 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/attack/ReportMatrixComponent.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/attack/ReportMatrixComponent.js
@@ -3,7 +3,7 @@ import React from 'react';
 import Checkbox from '../../ui-components/Checkbox';
 import ReactTable from 'react-table';
 import 'filepond/dist/filepond.min.css';
-import '../../../styles/report/ReportAttackMatrix.scss';
+import '../../../styles/pages/report/ReportAttackMatrix.scss';
 
 class ReportMatrixComponent extends React.Component {
   constructor(props) {
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarPrinciplesStatus.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarPrinciplesStatus.js
index 9d637581c..feff49e2a 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarPrinciplesStatus.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarPrinciplesStatus.js
@@ -7,7 +7,7 @@ import {Card, Collapse} from 'react-bootstrap';
 
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import {faChevronDown} from '@fortawesome/free-solid-svg-icons';
-import '../../../styles/report/ZeroTrustReport.scss';
+import '../../../styles/pages/report/ZeroTrustReport.scss';
 
 export default class SinglePillarPrinciplesStatus extends AuthComponent {
 
diff --git a/monkey/monkey_island/cc/ui/src/components/ui-components/Checkbox.js b/monkey/monkey_island/cc/ui/src/components/ui-components/Checkbox.js
index 54aaa46ec..fdf3acd4f 100644
--- a/monkey/monkey_island/cc/ui/src/components/ui-components/Checkbox.js
+++ b/monkey/monkey_island/cc/ui/src/components/ui-components/Checkbox.js
@@ -1,4 +1,4 @@
-import '../../styles/Checkbox.scss'
+import '../../styles/components/Checkbox.scss'
 import React from 'react';
 
 class CheckboxComponent extends React.PureComponent {
diff --git a/monkey/monkey_island/cc/ui/src/styles/Main.scss b/monkey/monkey_island/cc/ui/src/styles/Main.scss
index 1f06392e0..6b6096a3f 100644
--- a/monkey/monkey_island/cc/ui/src/styles/Main.scss
+++ b/monkey/monkey_island/cc/ui/src/styles/Main.scss
@@ -3,12 +3,14 @@
 @import '../../node_modules/bootstrap/scss/bootstrap';
 
 // Imports that require variables
-@import './report/ReportPage.scss';
-@import './report/AttackReport.scss';
-@import './PreviewPane.scss';
-@import './ConfigurationPage.scss';
-@import './AuthPage.scss';
-@import './MonkeyRunPage.scss';
+@import 'pages/report/ReportPage.scss';
+@import 'pages/report/AttackReport.scss';
+@import 'pages/ConfigurationPage';
+@import 'pages/AuthPage';
+@import 'pages/MonkeyRunPage';
+@import 'components/InfoPane';
+@import 'components/PreviewPane';
+@import 'components/AdvancedMultiSelect';
 
 
 // Define custom elements after bootstrap import
diff --git a/monkey/monkey_island/cc/ui/src/styles/Checkbox.scss b/monkey/monkey_island/cc/ui/src/styles/components/Checkbox.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/Checkbox.scss
rename to monkey/monkey_island/cc/ui/src/styles/components/Checkbox.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/Collapse.scss b/monkey/monkey_island/cc/ui/src/styles/components/Collapse.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/Collapse.scss
rename to monkey/monkey_island/cc/ui/src/styles/components/Collapse.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/Map.scss b/monkey/monkey_island/cc/ui/src/styles/components/Map.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/Map.scss
rename to monkey/monkey_island/cc/ui/src/styles/components/Map.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/PreviewPane.scss b/monkey/monkey_island/cc/ui/src/styles/components/PreviewPane.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/PreviewPane.scss
rename to monkey/monkey_island/cc/ui/src/styles/components/PreviewPane.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/Tooltip.scss b/monkey/monkey_island/cc/ui/src/styles/components/Tooltip.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/Tooltip.scss
rename to monkey/monkey_island/cc/ui/src/styles/components/Tooltip.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/particle-component/AuthPageParams.js b/monkey/monkey_island/cc/ui/src/styles/components/particle-component/AuthPageParams.js
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/particle-component/AuthPageParams.js
rename to monkey/monkey_island/cc/ui/src/styles/components/particle-component/AuthPageParams.js
diff --git a/monkey/monkey_island/cc/ui/src/styles/AuthPage.scss b/monkey/monkey_island/cc/ui/src/styles/pages/AuthPage.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/AuthPage.scss
rename to monkey/monkey_island/cc/ui/src/styles/pages/AuthPage.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/ConfigurationPage.scss b/monkey/monkey_island/cc/ui/src/styles/pages/ConfigurationPage.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/ConfigurationPage.scss
rename to monkey/monkey_island/cc/ui/src/styles/pages/ConfigurationPage.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/MonkeyRunPage.scss b/monkey/monkey_island/cc/ui/src/styles/pages/MonkeyRunPage.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/MonkeyRunPage.scss
rename to monkey/monkey_island/cc/ui/src/styles/pages/MonkeyRunPage.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/NotFoundPage.scss b/monkey/monkey_island/cc/ui/src/styles/pages/NotFoundPage.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/NotFoundPage.scss
rename to monkey/monkey_island/cc/ui/src/styles/pages/NotFoundPage.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/StartOverPage.scss b/monkey/monkey_island/cc/ui/src/styles/pages/StartOverPage.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/StartOverPage.scss
rename to monkey/monkey_island/cc/ui/src/styles/pages/StartOverPage.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/TelemetryPage.scss b/monkey/monkey_island/cc/ui/src/styles/pages/TelemetryPage.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/TelemetryPage.scss
rename to monkey/monkey_island/cc/ui/src/styles/pages/TelemetryPage.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/report/AttackReport.scss b/monkey/monkey_island/cc/ui/src/styles/pages/report/AttackReport.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/report/AttackReport.scss
rename to monkey/monkey_island/cc/ui/src/styles/pages/report/AttackReport.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/report/ReportAttackMatrix.scss b/monkey/monkey_island/cc/ui/src/styles/pages/report/ReportAttackMatrix.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/report/ReportAttackMatrix.scss
rename to monkey/monkey_island/cc/ui/src/styles/pages/report/ReportAttackMatrix.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/report/ReportPage.scss b/monkey/monkey_island/cc/ui/src/styles/pages/report/ReportPage.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/report/ReportPage.scss
rename to monkey/monkey_island/cc/ui/src/styles/pages/report/ReportPage.scss
diff --git a/monkey/monkey_island/cc/ui/src/styles/report/ZeroTrustReport.scss b/monkey/monkey_island/cc/ui/src/styles/pages/report/ZeroTrustReport.scss
similarity index 100%
rename from monkey/monkey_island/cc/ui/src/styles/report/ZeroTrustReport.scss
rename to monkey/monkey_island/cc/ui/src/styles/pages/report/ZeroTrustReport.scss