diff --git a/apps/1button/interface.html b/apps/1button/interface.html
index 04c7dfdb9..7d03e1394 100644
--- a/apps/1button/interface.html
+++ b/apps/1button/interface.html
@@ -5,7 +5,7 @@
   <body>
     <div id="records"></div>
 
-    <script src="../../lib/interface.js"></script>
+    <script src="../../core/lib/interface.js"></script>
     <script>
 var domRecords = document.getElementById("records");
 
diff --git a/apps/accelrec/interface.html b/apps/accelrec/interface.html
index c4b2d4461..ce3547387 100644
--- a/apps/accelrec/interface.html
+++ b/apps/accelrec/interface.html
@@ -5,7 +5,7 @@
   <body>
     <div id="data"></div>
 
-    <script src="../../lib/interface.js"></script>
+    <script src="../../core/lib/interface.js"></script>
     <script>
 var dataElement = document.getElementById("data");
 var fileData = {};
diff --git a/apps/beer/custom.html b/apps/beer/custom.html
index ab3f80b50..c4a9a3511 100644
--- a/apps/beer/custom.html
+++ b/apps/beer/custom.html
@@ -33,7 +33,7 @@
       <p>If ok, Click <button id="upload" class="btn btn-primary">Upload</button></p>
     </div>
 
-    <script src="../../lib/customize.js"></script>
+    <script src="../../core/lib/customize.js"></script>
     <script src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script>
     <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
     <script src="https://unpkg.com/osmtogeojson@2.2.12/osmtogeojson.js"></script>
diff --git a/apps/buffgym/buffgym.html b/apps/buffgym/buffgym.html
index 3c18932e9..26d3905ee 100644
--- a/apps/buffgym/buffgym.html
+++ b/apps/buffgym/buffgym.html
@@ -153,7 +153,7 @@
     <br><br>
     <button id="upload" class="btn btn-primary">Upload</button>
     
-    <script src="../../lib/interface.js"></script>
+    <script src="../../core/lib/interface.js"></script>
 
     <script>
         function workoutA() {
diff --git a/apps/custom/custom.html b/apps/custom/custom.html
index 5a5dbbecd..684f813ae 100644
--- a/apps/custom/custom.html
+++ b/apps/custom/custom.html
@@ -7,7 +7,7 @@
 </head>
 
 <body>
-    <script src="../../lib/customize.js"></script>
+    <script src="../../core/lib/customize.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.32.0/codemirror.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.52.2/mode/javascript/javascript.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.52.2/addon/lint/lint.min.js"></script>
diff --git a/apps/espruinoctrl/custom.html b/apps/espruinoctrl/custom.html
index e6297cf2e..007f3a123 100644
--- a/apps/espruinoctrl/custom.html
+++ b/apps/espruinoctrl/custom.html
@@ -27,7 +27,7 @@
   </div>
     <p><button id="upload" class="btn btn-primary">Upload to Bangle.js</button></p>
 
-    <script src="../../lib/customize.js"></script>
+    <script src="../../core/lib/customize.js"></script>
 
     <script>
       var options;
diff --git a/apps/gpsnav/waypoints.html b/apps/gpsnav/waypoints.html
index 483b933f4..d02260732 100644
--- a/apps/gpsnav/waypoints.html
+++ b/apps/gpsnav/waypoints.html
@@ -45,7 +45,7 @@
     <br>
     <button id="Download" class="btn btn-error">Reload</button> <button id="Upload" class="btn btn-primary">Upload</button>
     
-    <script src="../../lib/interface.js"></script>
+    <script src="../../core/lib/interface.js"></script>
 
     <script>
 
@@ -167,4 +167,4 @@
       });
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/apps/gpspoilog/interface.html b/apps/gpspoilog/interface.html
index ef3cc7688..e9ca02464 100644
--- a/apps/gpspoilog/interface.html
+++ b/apps/gpspoilog/interface.html
@@ -7,7 +7,7 @@
     <button class="btn btn-default" id="btnSave">Save</button>
     <button class="btn btn-default" id="btnDelete">Delete</button>
 
-    <script src="../../lib/interface.js"></script>
+    <script src="../../core/lib/interface.js"></script>
     <script>
 var dataElement = document.getElementById("data");
 var csvData = "";
diff --git a/apps/gpsrec/interface.html b/apps/gpsrec/interface.html
index bc8dc48e1..837162b74 100644
--- a/apps/gpsrec/interface.html
+++ b/apps/gpsrec/interface.html
@@ -5,7 +5,7 @@
   <body>
     <div id="tracks"></div>
 
-    <script src="../../lib/interface.js"></script>
+    <script src="../../core/lib/interface.js"></script>
     <script>
 var domTracks = document.getElementById("tracks");
 
diff --git a/apps/grocery/grocery.html b/apps/grocery/grocery.html
index 12711375d..9222dd20c 100644
--- a/apps/grocery/grocery.html
+++ b/apps/grocery/grocery.html
@@ -35,7 +35,7 @@
     <br><br>
     <button id="reset" class="btn btn-error">Reset</button> <button id="upload" class="btn btn-primary">Upload</button>
     
-    <script src="../../lib/customize.js"></script>
+    <script src="../../core/lib/customize.js"></script>
 
     <script>
 
diff --git a/apps/heart/interface.html b/apps/heart/interface.html
index 4a21d2e27..ce495c805 100644
--- a/apps/heart/interface.html
+++ b/apps/heart/interface.html
@@ -5,7 +5,7 @@
   <body>
     <div id="records"></div>
 
-    <script src="../../lib/interface.js"></script>
+    <script src="../../core/lib/interface.js"></script>
     <script>
 var domRecords = document.getElementById("records");
 
diff --git a/apps/imgclock/custom.html b/apps/imgclock/custom.html
index 5ba9a6962..2511f8a54 100644
--- a/apps/imgclock/custom.html
+++ b/apps/imgclock/custom.html
@@ -8,8 +8,8 @@
       </div>
     </div>
 
-    <script src="../../lib/customize.js"></script>
-    <script src="../../lib/imageconverter.js"></script>
+    <script src="../../core/lib/customize.js"></script>
+    <script src="../../core/lib/imageconverter.js"></script>
 
     <script>
       var faces = [
diff --git a/apps/locale/locale.html b/apps/locale/locale.html
index a6f13b276..bf3770e99 100644
--- a/apps/locale/locale.html
+++ b/apps/locale/locale.html
@@ -12,7 +12,7 @@
     </div>
     <p>Then click <button id="upload" class="btn btn-primary">Upload</button></p>
 
-    <script src="../../lib/customize.js"></script>
+    <script src="../../core/lib/customize.js"></script>
     <script src="locales.js" charset="utf-8"></script>
 
     <script>
diff --git a/apps/openstmap/custom.html b/apps/openstmap/custom.html
index 3e74e3d2b..81a55a4f8 100644
--- a/apps/openstmap/custom.html
+++ b/apps/openstmap/custom.html
@@ -38,11 +38,11 @@
       <button id="cancel" class="btn">Cancel</button></div>
     </div>
 
-    <script src="../../lib/customize.js"></script>
+    <script src="../../core/lib/customize.js"></script>
     <script src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script>
     <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
-    <script src="../../lib/heatshrink.js"></script>
-    <script src="../../lib/imageconverter.js"></script>
+    <script src="../../core/lib/heatshrink.js"></script>
+    <script src="../../core/lib/imageconverter.js"></script>
 
     <script>
     /*
diff --git a/apps/osmpoi/custom.html b/apps/osmpoi/custom.html
index 82532f64e..b06d0acff 100644
--- a/apps/osmpoi/custom.html
+++ b/apps/osmpoi/custom.html
@@ -49,7 +49,7 @@
       <p>If ok, Click <button id="upload" class="btn btn-primary">Upload</button></p>
     </div>
 
-    <script src="../../lib/customize.js"></script>
+    <script src="../../core/lib/customize.js"></script>
     <script src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script>
     <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
     <script src="https://unpkg.com/osmtogeojson@2.2.12/osmtogeojson.js"></script>
diff --git a/apps/qrcode/custom.html b/apps/qrcode/custom.html
index b37038ff7..6b288705a 100644
--- a/apps/qrcode/custom.html
+++ b/apps/qrcode/custom.html
@@ -28,10 +28,10 @@
     <p>Try your QR Code: <div id="qrcode"></div></p>
     <p>Click <button id="upload" class="btn btn-primary">Upload</button></p>
 
-    <script src="../../lib/customize.js"></script>
-    <script src="../../lib/qrcode.min.js"></script><!-- https://davidshimjs.github.io/qrcodejs/ -->
-    <script src="../../lib/heatshrink.js"></script>
-    <script src="../../lib/imageconverter.js"></script>
+    <script src="../../core/lib/customize.js"></script>
+    <script src="../../core/lib/qrcode.min.js"></script><!-- https://davidshimjs.github.io/qrcodejs/ -->
+    <script src="../../core/lib/heatshrink.js"></script>
+    <script src="../../core/lib/imageconverter.js"></script>
 
     <script>
       //https://github.com/evgeni/qifi/blob/gh-pages/index.html#L168
diff --git a/apps/route/custom.html b/apps/route/custom.html
index 52b6b635f..0079606b6 100644
--- a/apps/route/custom.html
+++ b/apps/route/custom.html
@@ -25,7 +25,7 @@
 <input class="form-input" type="file" id="fileLoader"/></p>
 <p><button id="upload" style="display:none" class="btn btn-primary">Upload</button></p>
 <pre id="log"></pre>
-<script src="../../lib/customize.js"></script>
+<script src="../../core/lib/customize.js"></script>
 <script>
 var xmlText = "";
 var xmlDoc;
diff --git a/apps/swatch/interface.html b/apps/swatch/interface.html
index 45391fb6e..1b239da3b 100644
--- a/apps/swatch/interface.html
+++ b/apps/swatch/interface.html
@@ -5,7 +5,7 @@
   <body>
     <div id="records"></div>
 
-    <script src="../../lib/interface.js"></script>
+    <script src="../../core/lib/interface.js"></script>
     <script>
 var domRecords = document.getElementById("records");
 
diff --git a/core/css/main.css b/css/main.css
similarity index 100%
rename from core/css/main.css
rename to css/main.css
diff --git a/core/css/pwa.css b/css/pwa.css
similarity index 100%
rename from core/css/pwa.css
rename to css/pwa.css
diff --git a/core/css/spectre-exp.min.css b/css/spectre-exp.min.css
similarity index 100%
rename from core/css/spectre-exp.min.css
rename to css/spectre-exp.min.css
diff --git a/core/css/spectre-icons.min.css b/css/spectre-icons.min.css
similarity index 100%
rename from core/css/spectre-icons.min.css
rename to css/spectre-icons.min.css
diff --git a/core/css/spectre.min.css b/css/spectre.min.css
similarity index 100%
rename from core/css/spectre.min.css
rename to css/spectre.min.css
diff --git a/index.html b/index.html
index 44d2e832c..7cb1a6c7c 100644
--- a/index.html
+++ b/index.html
@@ -3,11 +3,11 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=0.8,maximum-scale=0.8, minimum-scale=0.8, shrink-to-fit=no">
-    <link rel="stylesheet" href="core/css/spectre.min.css">
-    <link rel="stylesheet" href="core/css/spectre-exp.min.css">
-    <link rel="stylesheet" href="core/css/spectre-icons.min.css">
-    <link rel="stylesheet" href="core/css/pwa.css">
-    <link rel="stylesheet" href="core/css/main.css">
+    <link rel="stylesheet" href="css/spectre.min.css">
+    <link rel="stylesheet" href="css/spectre-exp.min.css">
+    <link rel="stylesheet" href="css/spectre-icons.min.css">
+    <link rel="stylesheet" href="css/pwa.css">
+    <link rel="stylesheet" href="css/main.css">
     <link rel="apple-touch-icon" sizes="180x180" href="img/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="16x16" href="img/favicon-16x16.png">
