diff --git a/Makefile b/Makefile
index f6d76ea..3e67f1b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-EXCLUDES = blown-up-demo components parameters
+EXCLUDES = components parameters
 OBJECTS := $(filter-out $(EXCLUDES),$(patsubst src/%.scad,%,$(wildcard src/*.scad)))
 dir_guard=@mkdir -p ./build
 
diff --git a/src/blown-up-demo.scad b/demo/blown-up-demo.scad
similarity index 50%
rename from src/blown-up-demo.scad
rename to demo/blown-up-demo.scad
index a321b7c..043fe6e 100644
--- a/src/blown-up-demo.scad
+++ b/demo/blown-up-demo.scad
@@ -3,28 +3,28 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-include <parameters.scad>
-include <components.scad>
-use <frame-piece-bottom-left-or-right.scad>
-use <frame-piece-interconnect.scad>
-use <frame-piece-side.scad>
-use <frame-piece-top-left-or-right.scad>
-use <top-panel-overhang-left-lever-and-dir_arc-plus-w-30mm.scad>
-use <top-panel-overhang-right-sega-2p-plus-one-plus-control-with-mount.scad>
-use <bottom-panel-overhang-left.scad>
-use <bottom-panel-overhang-right.scad>
-use <misc-decorative-plate-24mm-button.scad>
-use <misc-decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-plus-one.scad>
-use <misc-dustwasher-lsx-nobi.scad>
+include <../src/parameters.scad>
+include <../src/components.scad>
+use <../src/frame-piece-interconnect.scad>
+use <../src/frame-piece-side.scad>
+use <../src/frame-piece-top-or-bottom.scad>
+use <../src/frame-piece-top-or-bottom-aux-and-neutrik.scad>
+use <../src/top-panel-overhang-left-lever-and-dir_arc-plus-w-30mm.scad>
+use <../src/top-panel-overhang-right-sega-2p-plus-one-plus-control-with-mount.scad>
+use <../src/bottom-panel-overhang-left.scad>
+use <../src/bottom-panel-overhang-right.scad>
+use <../src/misc-decorative-plate-24mm-button.scad>
+use <../src/misc-decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-plus-one.scad>
+use <../src/misc-dustwasher-lsx-nobi.scad>
 
 color("#C12E1F") translate([-panel_x/2-25, 0, frame_z/2+75]) top_panel_left_lever_and_dir_arc_w_30mm();
 color("#C12E1F") translate([panel_x/2+25, 0, frame_z/2+75]) top_panel_right_sega_2p_plus_one_plus_control_with_mount();
-color("black") translate([-frame_x/2+5-25, 35, -2.5]) top_left_or_right_frame_piece();
-color("black") rotate([0, 180, 0]) translate([-frame_x/2+5-25, 35, -2.5]) top_left_or_right_frame_piece();
+color("black") translate([-frame_x/2+5-25, -55, -2.5]) top_or_bottom_frame_piece();
+color("black") rotate([0, 180, 0]) translate([-frame_x/2+5-25, -55, -2.5]) top_or_bottom_frame_piece();
 color("black") translate([-frame_x/2+5-50, 0, -2.5]) side_frame_piece();
 color("black") rotate([0, 180, 0]) translate([-frame_x/2+5-50, 0, -2.5]) side_frame_piece();
-color("black") translate([-frame_x/2+5-25, -35, -2.5]) bottom_left_or_right_frame_piece();
-color("black") rotate([0, 180, 0]) translate([-frame_x/2+5-25, -35, -2.5]) bottom_left_or_right_frame_piece();
+color("black") rotate([180, 0, 0]) translate([-frame_x/2+5-25, -55, -2.5]) top_or_bottom_aux_and_neutrik_frame_piece();
+color("black") rotate([180, 0, 0]) rotate([0, 180, 0]) translate([-frame_x/2+5-25, -55, -2.5]) top_or_bottom_aux_and_neutrik_frame_piece();
 color("black") interconnect_frame_piece();
 color("#C12E1F") translate([-panel_x/2-25, 0, -5-frame_z/2-75]) bottom_panel_left();
 color("#C12E1F") translate([panel_x/2+25, 0, -5-frame_z/2-75]) bottom_panel_right();