diff --git a/app/data/cfg.json b/app/data/cfg.json
index e17bddc..f30936f 100644
--- a/app/data/cfg.json
+++ b/app/data/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.160",
+  "version": "1.8.161",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/app/package-lock.json b/app/package-lock.json
index 6b48da9..83d7c6e 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.8.160",
+  "version": "1.8.161",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/app/package.json b/app/package.json
index 980b30f..e11babb 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.8.160",
+  "version": "1.8.161",
   "description": "GUI for the mcopy small gauge film optical printer platform",
   "main": "main.js",
   "scripts": {
diff --git a/data/cfg.json b/data/cfg.json
index e17bddc..f30936f 100644
--- a/data/cfg.json
+++ b/data/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.160",
+  "version": "1.8.161",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/package-lock.json b/package-lock.json
index 9bac254..f7cf2ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mcopy",
-  "version": "1.8.160",
+  "version": "1.8.161",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mcopy",
-      "version": "1.8.160",
+      "version": "1.8.161",
       "license": "MIT",
       "dependencies": {
         "alert": "file:app/lib/alert",
diff --git a/package.json b/package.json
index 166ac76..4d68a2e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy",
-  "version": "1.8.160",
+  "version": "1.8.161",
   "description": "Small gauge film optical printer platform",
   "main": "build.js",
   "directories": {
diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json
index e17bddc..f30936f 100644
--- a/processing/mcopy/cfg.json
+++ b/processing/mcopy/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.160",
+  "version": "1.8.161",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/scad/arri_s_mount.scad b/scad/arri_s_mount.scad
index f712bac..6db7ec3 100644
--- a/scad/arri_s_mount.scad
+++ b/scad/arri_s_mount.scad
@@ -1,4 +1,4 @@
-include <./common.scad>;
+include <./common/common.scad>;
 
 PART="mount";
 
diff --git a/scad/carriage.scad b/scad/carriage.scad
index bdec0ac..6fb207d 100644
--- a/scad/carriage.scad
+++ b/scad/carriage.scad
@@ -1,4 +1,4 @@
-include <./common.scad>;
+include <./common/common.scad>;
 
 ROD_D = 25.4 * 0.75;
 THREAD_D = 12;
diff --git a/scad/connectors.scad b/scad/connectors.scad
index 3a57cd2..9ac31c7 100644
--- a/scad/connectors.scad
+++ b/scad/connectors.scad
@@ -1,4 +1,4 @@
-include <./common.scad>;
+include <./common/common.scad>;
 
 //PINS
 PIN_A = [-(18 / 2) + (1 / 2) + 4.5, 2 + (3.5 / 2)];
diff --git a/scad/jk_lens_assembly.scad b/scad/jk_lens_assembly.scad
index c56b22c..c0d8c70 100644
--- a/scad/jk_lens_assembly.scad
+++ b/scad/jk_lens_assembly.scad
@@ -1,7 +1,7 @@
 //
 // JK lens assembly
 //
-include <./common.scad>;
+include <./common/common.scad>;
 include <./bellows.scad>;
 include <./knurledFinishLib_v2.scad>;
 
diff --git a/scad/light.scad b/scad/light.scad
index 97cae4c..328033f 100644
--- a/scad/light.scad
+++ b/scad/light.scad
@@ -1,4 +1,4 @@
-include <./common.scad>;
+include <./common/common.scad>;
 
 /*
     CynKen 1Pcs Optical Glass RGB Dispersion Prism X-CUBE for Physics Teach Decoration Art
diff --git a/scad/motor.scad b/scad/motor.scad
index f41b078..20e17e6 100644
--- a/scad/motor.scad
+++ b/scad/motor.scad
@@ -1,4 +1,4 @@
-include <./common.scad>;
+include <./common/common.scad>;
 include <./knurledFinishLib_v2.scad>
 include <./arduino.scad>
 
diff --git a/scad/takeup b/scad/takeup
index dbb3eca..6067ded 160000
--- a/scad/takeup
+++ b/scad/takeup
@@ -1 +1 @@
-Subproject commit dbb3eca85a46c0474c7e68e7febf43db508b53a8
+Subproject commit 6067dedb861e64a1203a4c5bedae7ebebaae6145