diff --git a/src/schule/ngb/zm/formen/Arc.java b/src/schule/ngb/zm/shapes/Arc.java
similarity index 98%
rename from src/schule/ngb/zm/formen/Arc.java
rename to src/schule/ngb/zm/shapes/Arc.java
index 3752c1c..a2ff6b2 100644
--- a/src/schule/ngb/zm/formen/Arc.java
+++ b/src/schule/ngb/zm/shapes/Arc.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Options;
 
diff --git a/src/schule/ngb/zm/formen/Arrow.java b/src/schule/ngb/zm/shapes/Arrow.java
similarity index 99%
rename from src/schule/ngb/zm/formen/Arrow.java
rename to src/schule/ngb/zm/shapes/Arrow.java
index 556a4c0..1feada9 100644
--- a/src/schule/ngb/zm/formen/Arrow.java
+++ b/src/schule/ngb/zm/shapes/Arrow.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Options;
 import schule.ngb.zm.Vector;
diff --git a/src/schule/ngb/zm/formen/Circle.java b/src/schule/ngb/zm/shapes/Circle.java
similarity index 97%
rename from src/schule/ngb/zm/formen/Circle.java
rename to src/schule/ngb/zm/shapes/Circle.java
index 8c614b0..d44dbc1 100644
--- a/src/schule/ngb/zm/formen/Circle.java
+++ b/src/schule/ngb/zm/shapes/Circle.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Options;
 
diff --git a/src/schule/ngb/zm/formen/Curve.java b/src/schule/ngb/zm/shapes/Curve.java
similarity index 99%
rename from src/schule/ngb/zm/formen/Curve.java
rename to src/schule/ngb/zm/shapes/Curve.java
index 1adfb34..ef12c7e 100644
--- a/src/schule/ngb/zm/formen/Curve.java
+++ b/src/schule/ngb/zm/shapes/Curve.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import java.awt.geom.CubicCurve2D;
 import java.awt.geom.Point2D;
diff --git a/src/schule/ngb/zm/formen/CustomShape.java b/src/schule/ngb/zm/shapes/CustomShape.java
similarity index 97%
rename from src/schule/ngb/zm/formen/CustomShape.java
rename to src/schule/ngb/zm/shapes/CustomShape.java
index 229978c..dd042b8 100644
--- a/src/schule/ngb/zm/formen/CustomShape.java
+++ b/src/schule/ngb/zm/shapes/CustomShape.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import java.awt.geom.Path2D;
 
diff --git a/src/schule/ngb/zm/formen/Ellipse.java b/src/schule/ngb/zm/shapes/Ellipse.java
similarity index 98%
rename from src/schule/ngb/zm/formen/Ellipse.java
rename to src/schule/ngb/zm/shapes/Ellipse.java
index ae3a93e..b7ac9e7 100644
--- a/src/schule/ngb/zm/formen/Ellipse.java
+++ b/src/schule/ngb/zm/shapes/Ellipse.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Options;
 
diff --git a/src/schule/ngb/zm/formen/FilledShape.java b/src/schule/ngb/zm/shapes/FilledShape.java
similarity index 96%
rename from src/schule/ngb/zm/formen/FilledShape.java
rename to src/schule/ngb/zm/shapes/FilledShape.java
index 36df1a5..aedefd3 100644
--- a/src/schule/ngb/zm/formen/FilledShape.java
+++ b/src/schule/ngb/zm/shapes/FilledShape.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Color;
 
diff --git a/src/schule/ngb/zm/formen/Kite.java b/src/schule/ngb/zm/shapes/Kite.java
similarity index 98%
rename from src/schule/ngb/zm/formen/Kite.java
rename to src/schule/ngb/zm/shapes/Kite.java
index 91fac07..00d9efc 100644
--- a/src/schule/ngb/zm/formen/Kite.java
+++ b/src/schule/ngb/zm/shapes/Kite.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Options;
 
diff --git a/src/schule/ngb/zm/formen/Line.java b/src/schule/ngb/zm/shapes/Line.java
similarity index 98%
rename from src/schule/ngb/zm/formen/Line.java
rename to src/schule/ngb/zm/shapes/Line.java
index 2c2a728..96ba5a9 100644
--- a/src/schule/ngb/zm/formen/Line.java
+++ b/src/schule/ngb/zm/shapes/Line.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Options;
 
diff --git a/src/schule/ngb/zm/formen/Picture.java b/src/schule/ngb/zm/shapes/Picture.java
similarity index 98%
rename from src/schule/ngb/zm/formen/Picture.java
rename to src/schule/ngb/zm/shapes/Picture.java
index 3b50d42..d9fabb5 100644
--- a/src/schule/ngb/zm/formen/Picture.java
+++ b/src/schule/ngb/zm/shapes/Picture.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 
 import schule.ngb.zm.Color;
diff --git a/src/schule/ngb/zm/formen/Point.java b/src/schule/ngb/zm/shapes/Point.java
similarity index 97%
rename from src/schule/ngb/zm/formen/Point.java
rename to src/schule/ngb/zm/shapes/Point.java
index 9e6fa7a..e405706 100644
--- a/src/schule/ngb/zm/formen/Point.java
+++ b/src/schule/ngb/zm/shapes/Point.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Options;
 
diff --git a/src/schule/ngb/zm/formen/Polygon.java b/src/schule/ngb/zm/shapes/Polygon.java
similarity index 98%
rename from src/schule/ngb/zm/formen/Polygon.java
rename to src/schule/ngb/zm/shapes/Polygon.java
index b14a208..5ec8fdd 100644
--- a/src/schule/ngb/zm/formen/Polygon.java
+++ b/src/schule/ngb/zm/shapes/Polygon.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import java.awt.geom.Path2D;
 import java.awt.geom.Point2D;
diff --git a/src/schule/ngb/zm/formen/Quad.java b/src/schule/ngb/zm/shapes/Quad.java
similarity index 96%
rename from src/schule/ngb/zm/formen/Quad.java
rename to src/schule/ngb/zm/shapes/Quad.java
index b62ffb4..6c7890c 100644
--- a/src/schule/ngb/zm/formen/Quad.java
+++ b/src/schule/ngb/zm/shapes/Quad.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import java.awt.geom.Point2D;
 import java.util.Arrays;
diff --git a/src/schule/ngb/zm/formen/Rectangle.java b/src/schule/ngb/zm/shapes/Rectangle.java
similarity index 98%
rename from src/schule/ngb/zm/formen/Rectangle.java
rename to src/schule/ngb/zm/shapes/Rectangle.java
index 80299a0..37cad17 100644
--- a/src/schule/ngb/zm/formen/Rectangle.java
+++ b/src/schule/ngb/zm/shapes/Rectangle.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Options;
 
diff --git a/src/schule/ngb/zm/formen/Rhombus.java b/src/schule/ngb/zm/shapes/Rhombus.java
similarity index 95%
rename from src/schule/ngb/zm/formen/Rhombus.java
rename to src/schule/ngb/zm/shapes/Rhombus.java
index 2f86ad7..7a7d39e 100644
--- a/src/schule/ngb/zm/formen/Rhombus.java
+++ b/src/schule/ngb/zm/shapes/Rhombus.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 public class Rhombus extends Kite {
 
diff --git a/src/schule/ngb/zm/formen/RoundedRectangle.java b/src/schule/ngb/zm/shapes/RoundedRectangle.java
similarity index 97%
rename from src/schule/ngb/zm/formen/RoundedRectangle.java
rename to src/schule/ngb/zm/shapes/RoundedRectangle.java
index 98b9bfb..f140786 100644
--- a/src/schule/ngb/zm/formen/RoundedRectangle.java
+++ b/src/schule/ngb/zm/shapes/RoundedRectangle.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import java.awt.geom.RoundRectangle2D;
 
diff --git a/src/schule/ngb/zm/formen/Shape.java b/src/schule/ngb/zm/shapes/Shape.java
similarity index 99%
rename from src/schule/ngb/zm/formen/Shape.java
rename to src/schule/ngb/zm/shapes/Shape.java
index 78846b2..c27920b 100644
--- a/src/schule/ngb/zm/formen/Shape.java
+++ b/src/schule/ngb/zm/shapes/Shape.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import org.jetbrains.annotations.NotNull;
 import schule.ngb.zm.Options;
diff --git a/src/schule/ngb/zm/formen/ShapeGroup.java b/src/schule/ngb/zm/shapes/ShapeGroup.java
similarity index 98%
rename from src/schule/ngb/zm/formen/ShapeGroup.java
rename to src/schule/ngb/zm/shapes/ShapeGroup.java
index e66d382..117326a 100644
--- a/src/schule/ngb/zm/formen/ShapeGroup.java
+++ b/src/schule/ngb/zm/shapes/ShapeGroup.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Options;
 
diff --git a/src/schule/ngb/zm/formen/ShapesLayer.java b/src/schule/ngb/zm/shapes/ShapesLayer.java
similarity index 65%
rename from src/schule/ngb/zm/formen/ShapesLayer.java
rename to src/schule/ngb/zm/shapes/ShapesLayer.java
index 2ffc1f0..e6c4ce1 100644
--- a/src/schule/ngb/zm/formen/ShapesLayer.java
+++ b/src/schule/ngb/zm/shapes/ShapesLayer.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Layer;
 
@@ -9,44 +9,44 @@ public class ShapesLayer extends Layer {
 
 	protected boolean clearBeforeDraw = true;
 
-	private LinkedList<Shape> formen;
+	private LinkedList<Shape> shapes;
 
 	public ShapesLayer() {
 		super();
-		formen = new LinkedList<Shape>();
+		shapes = new LinkedList<Shape>();
 	}
 
 	public ShapesLayer( int width, int height ) {
 		super(width, height);
-		formen = new LinkedList<Shape>();
+		shapes = new LinkedList<Shape>();
 	}
 
 	public void add( Shape... pFormen ) {
-		synchronized( formen ) {
+		synchronized( shapes ) {
 			for( Shape f : pFormen ) {
-				formen.add(f);
+				shapes.add(f);
 			}
 		}
 	}
 
 	public void showAll() {
-		synchronized( formen ) {
-			for( Shape pShape : formen ) {
+		synchronized( shapes ) {
+			for( Shape pShape : shapes ) {
 				pShape.hide();
 			}
 		}
 	}
 
 	public void hideAll() {
-		synchronized( formen ) {
-			for( Shape pShape : formen ) {
+		synchronized( shapes ) {
+			for( Shape pShape : shapes ) {
 				pShape.show();
 			}
 		}
 	}
 
 	public java.util.List<Shape> getShapes() {
-		return formen;
+		return shapes;
 	}
 
 	@Override
@@ -55,8 +55,8 @@ public class ShapesLayer extends Layer {
 			clear();
 		}
 
-		synchronized( formen ) {
-			for( Shape pShape : formen ) {
+		synchronized( shapes ) {
+			for( Shape pShape : shapes ) {
 				if( pShape.isVisible() ) {
 					pShape.draw(drawing);
 				}
diff --git a/src/schule/ngb/zm/formen/StrokedShape.java b/src/schule/ngb/zm/shapes/StrokedShape.java
similarity index 98%
rename from src/schule/ngb/zm/formen/StrokedShape.java
rename to src/schule/ngb/zm/shapes/StrokedShape.java
index 61508a6..f04512e 100644
--- a/src/schule/ngb/zm/formen/StrokedShape.java
+++ b/src/schule/ngb/zm/shapes/StrokedShape.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Color;
 import schule.ngb.zm.Constants;
diff --git a/src/schule/ngb/zm/formen/Text.java b/src/schule/ngb/zm/shapes/Text.java
similarity index 98%
rename from src/schule/ngb/zm/formen/Text.java
rename to src/schule/ngb/zm/shapes/Text.java
index ef8fb7f..7939b34 100644
--- a/src/schule/ngb/zm/formen/Text.java
+++ b/src/schule/ngb/zm/shapes/Text.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import schule.ngb.zm.Options;
 
diff --git a/src/schule/ngb/zm/formen/Triangle.java b/src/schule/ngb/zm/shapes/Triangle.java
similarity index 96%
rename from src/schule/ngb/zm/formen/Triangle.java
rename to src/schule/ngb/zm/shapes/Triangle.java
index 6aa8a71..d93a676 100644
--- a/src/schule/ngb/zm/formen/Triangle.java
+++ b/src/schule/ngb/zm/shapes/Triangle.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm.formen;
+package schule.ngb.zm.shapes;
 
 import java.awt.geom.Point2D;
 import java.util.Arrays;