diff --git a/black_stone.scad b/3dprint/black_stone.scad
similarity index 100%
rename from black_stone.scad
rename to 3dprint/black_stone.scad
diff --git a/export/black_stone.stl b/3dprint/export/black_stone.stl
similarity index 100%
rename from export/black_stone.stl
rename to 3dprint/export/black_stone.stl
diff --git a/export/goban.stl b/3dprint/export/goban.stl
similarity index 100%
rename from export/goban.stl
rename to 3dprint/export/goban.stl
diff --git a/export/white_stone.stl b/3dprint/export/white_stone.stl
similarity index 100%
rename from export/white_stone.stl
rename to 3dprint/export/white_stone.stl
diff --git a/goban.scad b/3dprint/goban.scad
similarity index 100%
rename from goban.scad
rename to 3dprint/goban.scad
diff --git a/params.scad b/3dprint/params.scad
similarity index 100%
rename from params.scad
rename to 3dprint/params.scad
diff --git a/white_stone.scad b/3dprint/white_stone.scad
similarity index 100%
rename from white_stone.scad
rename to 3dprint/white_stone.scad
diff --git a/lasercut/export/goban19x19-300x300-base.svg b/lasercut/export/goban19x19-300x300-base.svg
new file mode 100644
index 0000000..338c30d
--- /dev/null
+++ b/lasercut/export/goban19x19-300x300-base.svg
@@ -0,0 +1,380 @@
+
+
\ No newline at end of file
diff --git a/lasercut/goban19x19-300x300-recto.svg b/lasercut/export/goban19x19-300x300-recto.svg
similarity index 58%
rename from lasercut/goban19x19-300x300-recto.svg
rename to lasercut/export/goban19x19-300x300-recto.svg
index 287b023..528405d 100644
--- a/lasercut/goban19x19-300x300-recto.svg
+++ b/lasercut/export/goban19x19-300x300-recto.svg
@@ -1054,1086 +1054,1086 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/lasercut/goban19x19-300x300-verso.svg b/lasercut/export/goban19x19-300x300-verso.svg
similarity index 100%
rename from lasercut/goban19x19-300x300-verso.svg
rename to lasercut/export/goban19x19-300x300-verso.svg
diff --git a/lasercut/goban-lasercut.py b/lasercut/goban-lasercut.py
index b826683..54e50cc 100644
--- a/lasercut/goban-lasercut.py
+++ b/lasercut/goban-lasercut.py
@@ -314,19 +314,19 @@ if __name__ == "__main__":
help="Size of goban (number of stones)", metavar=('X', 'Y')
)
parser.add_argument(
- '--cellsize', type=int, nargs=2, default=(15, 15),
+ '--cellsize', type=float, nargs=2, default=(15, 15),
help="Size of one cell in mm", metavar=('X', 'Y')
)
parser.add_argument(
- '--stone-radius', type=int, default=5.5,
+ '--stone-radius', type=float, default=6.5,
help="Radius of stone in mm"
)
parser.add_argument(
- '--stone-margin', type=int, default=1,
+ '--stone-margin', type=float, default=0,
help="Margin of stone in mm"
)
parser.add_argument(
- '--borders', type=int, nargs=4, default=(5, 5, 5, 5),
+ '--borders', type=float, nargs=4, default=(5, 5, 5, 5),
help="Borders of goban in mm",
metavar=('UP', 'RIGHT', 'BOTTOM', 'LEFT')
)
diff --git a/lasercut/goban19x19-300x300-base.svg b/lasercut/goban19x19-300x300-base.svg
deleted file mode 100644
index 3f85832..0000000
--- a/lasercut/goban19x19-300x300-base.svg
+++ /dev/null
@@ -1,380 +0,0 @@
-
-
\ No newline at end of file