diff --git a/model/911614-pokedex-d9185ec5-1eb4-4bed-884c-4116a3e60127.pdf b/model/base_model/911614-pokedex-d9185ec5-1eb4-4bed-884c-4116a3e60127.pdf
similarity index 100%
rename from model/911614-pokedex-d9185ec5-1eb4-4bed-884c-4116a3e60127.pdf
rename to model/base_model/911614-pokedex-d9185ec5-1eb4-4bed-884c-4116a3e60127.pdf
diff --git a/model/LICENSE.md b/model/base_model/LICENSE.md
similarity index 100%
rename from model/LICENSE.md
rename to model/base_model/LICENSE.md
diff --git a/model/pokedex-full-assembly-v3-3mf.3mf b/model/base_model/pokedex-full-assembly-v3-3mf.3mf
similarity index 100%
rename from model/pokedex-full-assembly-v3-3mf.3mf
rename to model/base_model/pokedex-full-assembly-v3-3mf.3mf
diff --git a/model/pokedex-full-assembly-v3-step.3mf b/model/base_model/pokedex-full-assembly-v3-step.3mf
similarity index 100%
rename from model/pokedex-full-assembly-v3-step.3mf
rename to model/base_model/pokedex-full-assembly-v3-step.3mf
diff --git a/model/pokedex-full-assembly-v3-stl.stl b/model/base_model/pokedex-full-assembly-v3-stl.stl
similarity index 100%
rename from model/pokedex-full-assembly-v3-stl.stl
rename to model/base_model/pokedex-full-assembly-v3-stl.stl
diff --git a/model/pokedex-model_files.zip b/model/base_model/pokedex-model_files.zip
similarity index 100%
rename from model/pokedex-model_files.zip
rename to model/base_model/pokedex-model_files.zip
diff --git a/model/pokedex-open.webp b/model/base_model/pokedex-open.webp
similarity index 100%
rename from model/pokedex-open.webp
rename to model/base_model/pokedex-open.webp
diff --git a/model/combined.scad b/model/combined.scad
new file mode 100644
index 0000000..419e330
--- /dev/null
+++ b/model/combined.scad
@@ -0,0 +1,6 @@
+include <common.scad>
+use <left-half.scad>
+use <right-half.scad>
+
+left_half();
+right_half();
diff --git a/model/common.scad b/model/common.scad
new file mode 100644
index 0000000..a3a5540
--- /dev/null
+++ b/model/common.scad
@@ -0,0 +1,45 @@
+BASE_MODEL_SCALE = [1,1,1];
+
+module main_display(){
+    // Outer dimensions, height currently unknown
+    cube([55.04, 89.3, 10]);
+}
+
+module pad(){
+    // A button has 4.2 x 6 mm -> At least ~20x20 are required for the PCB
+    cube([20, 20, 10]);
+}
+
+module small_display_below_main()
+{
+    // https://de.aliexpress.com/item/1005003753680706.html
+    cube([45.8, 20, 11.3]);
+    // old i2c variant:
+    //cube([43.5, 19.44, 4.5]);
+    
+    // initial dimension ideas
+    // cube([38,16,4]);
+    // translate([150,0,0]) cube([22,5.5,4]);
+}
+
+module tertiary_display()
+{
+    // https://de.aliexpress.com/item/1005006034531826.html
+    cube([80, 36, 10]);
+}
+
+module battery() {
+    // 18650 with holder
+    // cube([75, 20, 20]);
+    rotate([0,90,0]) cylinder(d=18, h=65);
+}
+
+module microcontroller() {
+    // width 32 including USB-C port
+    length = 91.5;
+    height = 20;
+    battery_length = 65;
+    delta = length - battery_length;
+    cube([length, 32, height]);
+    translate([delta / 2,16, 15]) battery();
+}
diff --git a/model/left-half.3mf b/model/left-half.3mf
new file mode 100644
index 0000000..279c9a7
Binary files /dev/null and b/model/left-half.3mf differ
diff --git a/model/left-half.scad b/model/left-half.scad
new file mode 100644
index 0000000..23c7a91
--- /dev/null
+++ b/model/left-half.scad
@@ -0,0 +1,7 @@
+include <common.scad>
+
+module left_half() {
+    import(file = "left-half.3mf");
+}
+
+left_half();
\ No newline at end of file
diff --git a/model/pokedex-component-size-comparisons.scad b/model/pokedex-component-size-comparisons.scad
index 737ca01..aa90adb 100644
--- a/model/pokedex-component-size-comparisons.scad
+++ b/model/pokedex-component-size-comparisons.scad
@@ -28,17 +28,30 @@ module tertiary_display()
 
 module battery() {
     // 18650 with holder
-    cube([75, 20, 20]);
+    // cube([75, 20, 20]);
+    rotate([0,90,0]) cylinder(d=18, h=65);
 }
 
-translate([0,0,7]) import("pokedex-full-assembly-v3-3mf.3mf");
+module microcontroller() {
+    // width 32 including USB-C port
+    length = 91.5;
+    height = 20;
+    battery_length = 65;
+    delta = length - battery_length;
+    cube([length, 32, height]);
+    translate([delta / 2,16, 15]) battery();
+}
+
+translate([0,0,7]) import("base_model/pokedex-full-assembly-v3-3mf.3mf");
 
 #translate([-100, -100, 0]) {
   translate([40, -13, 0]) pad();
   translate([0,20,0]) main_display();
   translate([-7,-13,0]) small_display_below_main();
-  translate([0,130,-8]) rotate([0,0,90]) battery();
+  //translate([0,130,-8]) rotate([0,0,90]) battery();
 }
 #translate([42,-118,0]) small_display_below_main();
 #translate([-5,-118,0]) small_display_below_main();
 #translate([2,-40,0]) tertiary_display();
+
+#translate([-122,12,-8]) microcontroller();
diff --git a/model/right-half.3mf b/model/right-half.3mf
new file mode 100644
index 0000000..fd81e41
Binary files /dev/null and b/model/right-half.3mf differ
diff --git a/model/right-half.scad b/model/right-half.scad
new file mode 100644
index 0000000..62b53f3
--- /dev/null
+++ b/model/right-half.scad
@@ -0,0 +1,7 @@
+include <common.scad>
+
+module right_half() {
+    import(file = "right-half.3mf");
+}
+
+right_half();
\ No newline at end of file