diff --git a/src/main/java/schule/ngb/zm/BasicDrawable.java b/src/main/java/schule/ngb/zm/BasicDrawable.java
index ee11fea..be6e804 100644
--- a/src/main/java/schule/ngb/zm/BasicDrawable.java
+++ b/src/main/java/schule/ngb/zm/BasicDrawable.java
@@ -1,8 +1,5 @@
 package schule.ngb.zm;
 
-import schule.ngb.zm.shapes.Fillable;
-import schule.ngb.zm.shapes.Strokeable;
-
 import java.awt.GradientPaint;
 import java.awt.Graphics2D;
 import java.awt.Paint;
diff --git a/src/main/java/schule/ngb/zm/shapes/Fillable.java b/src/main/java/schule/ngb/zm/Fillable.java
similarity index 98%
rename from src/main/java/schule/ngb/zm/shapes/Fillable.java
rename to src/main/java/schule/ngb/zm/Fillable.java
index fc7ec8e..f69c789 100644
--- a/src/main/java/schule/ngb/zm/shapes/Fillable.java
+++ b/src/main/java/schule/ngb/zm/Fillable.java
@@ -1,9 +1,6 @@
-package schule.ngb.zm.shapes;
+package schule.ngb.zm;
 
-import schule.ngb.zm.Color;
-import schule.ngb.zm.Constants;
-import schule.ngb.zm.Drawable;
-import schule.ngb.zm.Options;
+import schule.ngb.zm.shapes.Shape;
 
 import java.awt.GradientPaint;
 import java.awt.Paint;
diff --git a/src/main/java/schule/ngb/zm/shapes/Strokeable.java b/src/main/java/schule/ngb/zm/Strokeable.java
similarity index 97%
rename from src/main/java/schule/ngb/zm/shapes/Strokeable.java
rename to src/main/java/schule/ngb/zm/Strokeable.java
index 04cbd2b..48db51f 100644
--- a/src/main/java/schule/ngb/zm/shapes/Strokeable.java
+++ b/src/main/java/schule/ngb/zm/Strokeable.java
@@ -1,9 +1,6 @@
-package schule.ngb.zm.shapes;
+package schule.ngb.zm;
 
-import schule.ngb.zm.Color;
-import schule.ngb.zm.Constants;
-import schule.ngb.zm.Drawable;
-import schule.ngb.zm.Options;
+import schule.ngb.zm.shapes.Shape;
 
 import java.awt.BasicStroke;
 import java.awt.Stroke;
diff --git a/src/main/java/schule/ngb/zm/layers/DrawingLayer.java b/src/main/java/schule/ngb/zm/layers/DrawingLayer.java
index 5ef24f5..fc42508 100644
--- a/src/main/java/schule/ngb/zm/layers/DrawingLayer.java
+++ b/src/main/java/schule/ngb/zm/layers/DrawingLayer.java
@@ -3,8 +3,8 @@ package schule.ngb.zm.layers;
 import schule.ngb.zm.Color;
 import schule.ngb.zm.Layer;
 import schule.ngb.zm.Options;
-import schule.ngb.zm.shapes.Fillable;
-import schule.ngb.zm.shapes.Strokeable;
+import schule.ngb.zm.Fillable;
+import schule.ngb.zm.Strokeable;
 import schule.ngb.zm.shapes.Text;
 import schule.ngb.zm.util.io.ImageLoader;
 
diff --git a/src/main/java/schule/ngb/zm/layers/TurtleLayer.java b/src/main/java/schule/ngb/zm/layers/TurtleLayer.java
index a72a231..d129e44 100644
--- a/src/main/java/schule/ngb/zm/layers/TurtleLayer.java
+++ b/src/main/java/schule/ngb/zm/layers/TurtleLayer.java
@@ -1,10 +1,8 @@
 package schule.ngb.zm.layers;
 
 import schule.ngb.zm.*;
-import schule.ngb.zm.shapes.Fillable;
-import schule.ngb.zm.shapes.Rectangle;
-import schule.ngb.zm.shapes.Shape;
-import schule.ngb.zm.shapes.Strokeable;
+import schule.ngb.zm.Fillable;
+import schule.ngb.zm.Strokeable;
 
 import java.awt.GradientPaint;
 import java.awt.Graphics2D;
diff --git a/src/main/java/schule/ngb/zm/shapes/Shape.java b/src/main/java/schule/ngb/zm/shapes/Shape.java
index a0dad46..9408faf 100644
--- a/src/main/java/schule/ngb/zm/shapes/Shape.java
+++ b/src/main/java/schule/ngb/zm/shapes/Shape.java
@@ -1,14 +1,8 @@
 package schule.ngb.zm.shapes;
 
-import schule.ngb.zm.BasicDrawable;
-import schule.ngb.zm.Color;
-import schule.ngb.zm.Constants;
-import schule.ngb.zm.Options;
+import schule.ngb.zm.*;
 
-import java.awt.GradientPaint;
 import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Stroke;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;