diff --git a/Makefile b/Makefile
index f7f48fa..aa4e250 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ PRINT_TEMP=220
 PRINT_BED_TEMP=65
 PRINT_NOZZLE_DIAM=0.4
 PRINT_FILA_DIAM=1.75
-# XXX: Slic2r doesn't always set the bed temperature correctly. fix by specifying it also for the first layer.
+# XXX: Slic3r doesn't always set the bed temperature correctly. fix by specifying it also for the first layer.
 SLIC3R_FLAGS=\
 	--temperature $(PRINT_TEMP) \
 	--first-layer-temperature $(PRINT_TEMP) \
@@ -15,7 +15,7 @@ SLIC3R_FLAGS=\
 
 all: build/case.stl build/case.gcode
 
-build/%.stl: %.scad *.scad
+build/%.stl: src/%.scad src/*.scad
 	mkdir -p build
 	openscad $< -o $@
 
@@ -24,6 +24,7 @@ build/%.stl: %.scad *.scad
 
 install:
 	mkdir -p $(SHAREDIR)
-	install -m644 case.stl $(SHAREDIR)
+	install -m644 build/case.stl $(SHAREDIR)
+	install -m644 build/case.gcode $(SHAREDIR)
 
 .PHONY: all install
diff --git a/bits.scad b/src/bits.scad
similarity index 100%
rename from bits.scad
rename to src/bits.scad
diff --git a/case.scad b/src/case.scad
similarity index 95%
rename from case.scad
rename to src/case.scad
index 4a1e5c3..21f6790 100644
--- a/case.scad
+++ b/src/case.scad
@@ -71,7 +71,7 @@ module Case()
   color("DarkSlateGray")
   difference() {
     minkowski() {
-      sphere(d=Thickness);
+      sphere(r=Thickness);
       // Phone(volume=false, power=false, camera=false);
       PhoneBody();
     }
@@ -107,7 +107,9 @@ module Case()
   }
 }
 
-Case();
+translate([BodyWidth + Thickness, Thickness, BodyHeight + Thickness])
+rotate(a=[0, 180, 0])
+  Case();
 
 // debugging:
 // _FrontFace();
diff --git a/defaults.scad b/src/defaults.scad
similarity index 100%
rename from defaults.scad
rename to src/defaults.scad
diff --git a/dimensions.scad b/src/dimensions.scad
similarity index 100%
rename from dimensions.scad
rename to src/dimensions.scad
diff --git a/phone.scad b/src/phone.scad
similarity index 100%
rename from phone.scad
rename to src/phone.scad
diff --git a/primitives.scad b/src/primitives.scad
similarity index 100%
rename from primitives.scad
rename to src/primitives.scad