diff --git a/src/components/actionsheet/package.json b/src/components/actionsheet/package.json
deleted file mode 100644
index 622f1e075d..0000000000
--- a/src/components/actionsheet/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "actionsheet.js"
-}
\ No newline at end of file
diff --git a/src/components/dialog/package.json b/src/components/dialog/package.json
deleted file mode 100644
index d13dd844ba..0000000000
--- a/src/components/dialog/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "dialog.js"
-}
\ No newline at end of file
diff --git a/src/components/dialogHelper/package.json b/src/components/dialogHelper/package.json
deleted file mode 100644
index 71863d045f..0000000000
--- a/src/components/dialogHelper/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "dialogHelper.js"
-}
\ No newline at end of file
diff --git a/src/components/headroom/package.json b/src/components/headroom/package.json
deleted file mode 100644
index 9c6c42c82a..0000000000
--- a/src/components/headroom/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "headroom.js"
-}
\ No newline at end of file
diff --git a/src/components/navdrawer/package.json b/src/components/navdrawer/package.json
deleted file mode 100644
index d02800957b..0000000000
--- a/src/components/navdrawer/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "navdrawer.js"
-}
\ No newline at end of file
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 304eec7e08..c30819f423 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -2,7 +2,6 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
     'use strict';
 
     function onOneDocumentClick() {
-
         document.removeEventListener('click', onOneDocumentClick);
         document.removeEventListener('keydown', onOneDocumentClick);
 
@@ -10,15 +9,14 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
             Notification.requestPermission();
         }
     }
+
     document.addEventListener('click', onOneDocumentClick);
     document.addEventListener('keydown', onOneDocumentClick);
 
     var serviceWorkerRegistration;
 
     function closeAfter(notification, timeoutMs) {
-
         setTimeout(function () {
-
             if (notification.close) {
                 notification.close();
             }
@@ -29,9 +27,7 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
     }
 
     function resetRegistration() {
-
         var serviceWorker = navigator.serviceWorker;
-
         if (serviceWorker) {
             serviceWorker.ready.then(function (registration) {
                 serviceWorkerRegistration = registration;
@@ -273,4 +269,4 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
 
         showNotification(notification, 0, apiClient);
     });
-});
\ No newline at end of file
+});
diff --git a/src/components/toast/package.json b/src/components/toast/package.json
deleted file mode 100644
index 2e64841a7f..0000000000
--- a/src/components/toast/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "toast.js"
-}
\ No newline at end of file
diff --git a/src/components/viewManager/package.json b/src/components/viewManager/package.json
deleted file mode 100644
index 819371af71..0000000000
--- a/src/components/viewManager/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "viewManager.js"
-}
\ No newline at end of file
diff --git a/src/components/clearbutton.css b/src/css/clearbutton.css
similarity index 100%
rename from src/components/clearbutton.css
rename to src/css/clearbutton.css
diff --git a/src/components/flexstyles.css b/src/css/flexstyles.css
similarity index 100%
rename from src/components/flexstyles.css
rename to src/css/flexstyles.css
diff --git a/src/css/fonts.sized.css b/src/css/fonts.sized.css
index 073b74167c..9cdd666109 100644
--- a/src/css/fonts.sized.css
+++ b/src/css/fonts.sized.css
@@ -25,7 +25,6 @@ h3 {
 
 /* This is supposed to be 1080p, but had to reduce the min height to account for possible browser chrome */
 @media all and (min-height: 1000px) {
-
     html {
         font-size: 27px;
     }
diff --git a/src/scripts/site.js b/src/scripts/site.js
index e05712c076..d902cdf6de 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -720,9 +720,9 @@ var AppInfo = {};
         define("programStyles", ["css!" + componentsPath + "/guide/programs"], returnFirstDependency);
         define("listViewStyle", ["css!" + componentsPath + "/listview/listview"], returnFirstDependency);
         define("formDialogStyle", ["css!" + componentsPath + "/formdialog"], returnFirstDependency);
-        define("clearButtonStyle", ["css!" + componentsPath + "/clearbutton"], returnFirstDependency);
+        define("clearButtonStyle", ["css!css/clearbutton"], returnFirstDependency);
         define("cardStyle", ["css!" + componentsPath + "/cardbuilder/card"], returnFirstDependency);
-        define("flexStyles", ["css!" + componentsPath + "/flexstyles"], returnFirstDependency);
+        define("flexStyles", ["css!css/flexstyles"], returnFirstDependency);
 
         // define legacy features
         // TODO delete the rest of these