diff --git a/gulpfile.js b/gulpfile.js
index 890d6efaeb..de261d6fe6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -17,7 +17,7 @@ const paths = {
     coverage: './coverage/',
     npmDir: './node_modules/',
     popupDir: './src/popup/',
-    cssDir: './src/css/'
+    cssDir: './src/popup/css/'
 };
 
 const filters = {
diff --git a/src/popup/main.ts b/src/popup/main.ts
index 45d09780a1..118766ca15 100644
--- a/src/popup/main.ts
+++ b/src/popup/main.ts
@@ -2,7 +2,7 @@ import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 // tslint:disable-next-line
-require('../scss/popup.scss');
+require('./scss/popup.scss');
 // tslint:disable-next-line
 require('../scripts/duo.js');
 
diff --git a/src/scss/base.scss b/src/popup/scss/base.scss
similarity index 100%
rename from src/scss/base.scss
rename to src/popup/scss/base.scss
diff --git a/src/scss/box.scss b/src/popup/scss/box.scss
similarity index 100%
rename from src/scss/box.scss
rename to src/popup/scss/box.scss
diff --git a/src/scss/buttons.scss b/src/popup/scss/buttons.scss
similarity index 100%
rename from src/scss/buttons.scss
rename to src/popup/scss/buttons.scss
diff --git a/src/scss/environment.scss b/src/popup/scss/environment.scss
similarity index 100%
rename from src/scss/environment.scss
rename to src/popup/scss/environment.scss
diff --git a/src/scss/misc.scss b/src/popup/scss/misc.scss
similarity index 94%
rename from src/scss/misc.scss
rename to src/popup/scss/misc.scss
index 1afd46df73..31ebe2ada3 100644
--- a/src/scss/misc.scss
+++ b/src/popup/scss/misc.scss
@@ -1,4 +1,4 @@
-@import "variables.scss";
+@import "variables.scss";
 
 small {
     font-size: $font-size-small;
@@ -76,7 +76,7 @@ small {
 }
 
 #duo-frame {
-    background: url('../popup/images/loading.svg') 0 0 no-repeat;
+    background: url('../images/loading.svg') 0 0 no-repeat;
     width: 100%;
     height: 470px;
     margin-bottom: -10px;
diff --git a/src/scss/plugins.scss b/src/popup/scss/plugins.scss
similarity index 100%
rename from src/scss/plugins.scss
rename to src/popup/scss/plugins.scss
diff --git a/src/scss/popup.scss b/src/popup/scss/popup.scss
similarity index 100%
rename from src/scss/popup.scss
rename to src/popup/scss/popup.scss
diff --git a/src/scss/variables.scss b/src/popup/scss/variables.scss
similarity index 100%
rename from src/scss/variables.scss
rename to src/popup/scss/variables.scss