diff --git a/src/main/java/ovh/gasser/rxshapes/App.java b/src/main/java/ovh/gasser/newshapes/App.java
similarity index 84%
rename from src/main/java/ovh/gasser/rxshapes/App.java
rename to src/main/java/ovh/gasser/newshapes/App.java
index c7157fe..a0244a1 100644
--- a/src/main/java/ovh/gasser/rxshapes/App.java
+++ b/src/main/java/ovh/gasser/newshapes/App.java
@@ -1,9 +1,9 @@
-package ovh.gasser.rxshapes;
+package ovh.gasser.newshapes;
 
-import ovh.gasser.rxshapes.shapes.SCollection;
-import ovh.gasser.rxshapes.shapes.SRectangle;
-import ovh.gasser.rxshapes.shapes.Shape;
-import ovh.gasser.rxshapes.ui.ShapesView;
+import ovh.gasser.newshapes.shapes.SCollection;
+import ovh.gasser.newshapes.shapes.SRectangle;
+import ovh.gasser.newshapes.shapes.Shape;
+import ovh.gasser.newshapes.ui.ShapesView;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/ovh/gasser/rxshapes/HTMLExporter.java b/src/main/java/ovh/gasser/newshapes/HTMLExporter.java
similarity index 86%
rename from src/main/java/ovh/gasser/rxshapes/HTMLExporter.java
rename to src/main/java/ovh/gasser/newshapes/HTMLExporter.java
index 9059e60..35767c2 100644
--- a/src/main/java/ovh/gasser/rxshapes/HTMLExporter.java
+++ b/src/main/java/ovh/gasser/newshapes/HTMLExporter.java
@@ -1,8 +1,8 @@
-package ovh.gasser.rxshapes;
+package ovh.gasser.newshapes;
 
-import ovh.gasser.rxshapes.shapes.SCollection;
-import ovh.gasser.rxshapes.shapes.SRectangle;
-import ovh.gasser.rxshapes.ui.html.*;
+import ovh.gasser.newshapes.shapes.SCollection;
+import ovh.gasser.newshapes.shapes.SRectangle;
+import ovh.gasser.newshapes.ui.html.*;
 
 import java.awt.*;
 import java.io.FileNotFoundException;
diff --git a/src/main/java/ovh/gasser/rxshapes/Selection.java b/src/main/java/ovh/gasser/newshapes/Selection.java
similarity index 78%
rename from src/main/java/ovh/gasser/rxshapes/Selection.java
rename to src/main/java/ovh/gasser/newshapes/Selection.java
index 300b3b4..0442859 100644
--- a/src/main/java/ovh/gasser/rxshapes/Selection.java
+++ b/src/main/java/ovh/gasser/newshapes/Selection.java
@@ -1,7 +1,7 @@
-package ovh.gasser.rxshapes;
+package ovh.gasser.newshapes;
 
-import ovh.gasser.rxshapes.attributes.SelectionAttributes;
-import ovh.gasser.rxshapes.shapes.Shape;
+import ovh.gasser.newshapes.attributes.SelectionAttributes;
+import ovh.gasser.newshapes.shapes.Shape;
 
 public class Selection {
 
diff --git a/src/main/java/ovh/gasser/rxshapes/ShapeVisitor.java b/src/main/java/ovh/gasser/newshapes/ShapeVisitor.java
similarity index 51%
rename from src/main/java/ovh/gasser/rxshapes/ShapeVisitor.java
rename to src/main/java/ovh/gasser/newshapes/ShapeVisitor.java
index c5776cf..c740bab 100644
--- a/src/main/java/ovh/gasser/rxshapes/ShapeVisitor.java
+++ b/src/main/java/ovh/gasser/newshapes/ShapeVisitor.java
@@ -1,7 +1,7 @@
-package ovh.gasser.rxshapes;
+package ovh.gasser.newshapes;
 
-import ovh.gasser.rxshapes.shapes.SCollection;
-import ovh.gasser.rxshapes.shapes.SRectangle;
+import ovh.gasser.newshapes.shapes.SCollection;
+import ovh.gasser.newshapes.shapes.SRectangle;
 
 public interface ShapeVisitor {
     void visitRectangle(SRectangle sRectangle);
diff --git a/src/main/java/ovh/gasser/rxshapes/attributes/Attributes.java b/src/main/java/ovh/gasser/newshapes/attributes/Attributes.java
similarity index 56%
rename from src/main/java/ovh/gasser/rxshapes/attributes/Attributes.java
rename to src/main/java/ovh/gasser/newshapes/attributes/Attributes.java
index e3579fd..2d0ed3c 100644
--- a/src/main/java/ovh/gasser/rxshapes/attributes/Attributes.java
+++ b/src/main/java/ovh/gasser/newshapes/attributes/Attributes.java
@@ -1,4 +1,4 @@
-package ovh.gasser.rxshapes.attributes;
+package ovh.gasser.newshapes.attributes;
 
 public interface Attributes {
     String getID();
diff --git a/src/main/java/ovh/gasser/rxshapes/attributes/ColorAttributes.java b/src/main/java/ovh/gasser/newshapes/attributes/ColorAttributes.java
similarity index 95%
rename from src/main/java/ovh/gasser/rxshapes/attributes/ColorAttributes.java
rename to src/main/java/ovh/gasser/newshapes/attributes/ColorAttributes.java
index f8f929b..1cb0599 100644
--- a/src/main/java/ovh/gasser/rxshapes/attributes/ColorAttributes.java
+++ b/src/main/java/ovh/gasser/newshapes/attributes/ColorAttributes.java
@@ -1,4 +1,4 @@
-package ovh.gasser.rxshapes.attributes;
+package ovh.gasser.newshapes.attributes;
 
 import java.awt.*;
 
diff --git a/src/main/java/ovh/gasser/rxshapes/attributes/SelectionAttributes.java b/src/main/java/ovh/gasser/newshapes/attributes/SelectionAttributes.java
similarity index 83%
rename from src/main/java/ovh/gasser/rxshapes/attributes/SelectionAttributes.java
rename to src/main/java/ovh/gasser/newshapes/attributes/SelectionAttributes.java
index 56d1059..f23383b 100644
--- a/src/main/java/ovh/gasser/rxshapes/attributes/SelectionAttributes.java
+++ b/src/main/java/ovh/gasser/newshapes/attributes/SelectionAttributes.java
@@ -1,4 +1,4 @@
-package ovh.gasser.rxshapes.attributes;
+package ovh.gasser.newshapes.attributes;
 
 public class SelectionAttributes implements Attributes {
     public static final String ID = "SELECTION_ATTRS";
diff --git a/src/main/java/ovh/gasser/rxshapes/shapes/AbstractShape.java b/src/main/java/ovh/gasser/newshapes/shapes/AbstractShape.java
similarity index 92%
rename from src/main/java/ovh/gasser/rxshapes/shapes/AbstractShape.java
rename to src/main/java/ovh/gasser/newshapes/shapes/AbstractShape.java
index e235cf5..dc3650a 100644
--- a/src/main/java/ovh/gasser/rxshapes/shapes/AbstractShape.java
+++ b/src/main/java/ovh/gasser/newshapes/shapes/AbstractShape.java
@@ -1,6 +1,6 @@
-package ovh.gasser.rxshapes.shapes;
+package ovh.gasser.newshapes.shapes;
 
-import ovh.gasser.rxshapes.attributes.Attributes;
+import ovh.gasser.newshapes.attributes.Attributes;
 
 import java.awt.*;
 import java.util.Map;
diff --git a/src/main/java/ovh/gasser/rxshapes/shapes/SCollection.java b/src/main/java/ovh/gasser/newshapes/shapes/SCollection.java
similarity index 88%
rename from src/main/java/ovh/gasser/rxshapes/shapes/SCollection.java
rename to src/main/java/ovh/gasser/newshapes/shapes/SCollection.java
index 52f12e8..985f472 100644
--- a/src/main/java/ovh/gasser/rxshapes/shapes/SCollection.java
+++ b/src/main/java/ovh/gasser/newshapes/shapes/SCollection.java
@@ -1,9 +1,9 @@
-package ovh.gasser.rxshapes.shapes;
+package ovh.gasser.newshapes.shapes;
 
-import ovh.gasser.rxshapes.App;
-import ovh.gasser.rxshapes.attributes.SelectionAttributes;
-import ovh.gasser.rxshapes.ShapeVisitor;
-import ovh.gasser.rxshapes.util.Streamable;
+import ovh.gasser.newshapes.App;
+import ovh.gasser.newshapes.attributes.SelectionAttributes;
+import ovh.gasser.newshapes.ShapeVisitor;
+import ovh.gasser.newshapes.util.Streamable;
 
 import java.awt.*;
 import java.util.Iterator;
diff --git a/src/main/java/ovh/gasser/rxshapes/shapes/SRectangle.java b/src/main/java/ovh/gasser/newshapes/shapes/SRectangle.java
similarity index 81%
rename from src/main/java/ovh/gasser/rxshapes/shapes/SRectangle.java
rename to src/main/java/ovh/gasser/newshapes/shapes/SRectangle.java
index 4f386c3..f088e72 100644
--- a/src/main/java/ovh/gasser/rxshapes/shapes/SRectangle.java
+++ b/src/main/java/ovh/gasser/newshapes/shapes/SRectangle.java
@@ -1,8 +1,8 @@
-package ovh.gasser.rxshapes.shapes;
+package ovh.gasser.newshapes.shapes;
 
-import ovh.gasser.rxshapes.attributes.ColorAttributes;
-import ovh.gasser.rxshapes.attributes.SelectionAttributes;
-import ovh.gasser.rxshapes.ShapeVisitor;
+import ovh.gasser.newshapes.attributes.ColorAttributes;
+import ovh.gasser.newshapes.attributes.SelectionAttributes;
+import ovh.gasser.newshapes.ShapeVisitor;
 
 import java.awt.*;
 
diff --git a/src/main/java/ovh/gasser/rxshapes/shapes/Shape.java b/src/main/java/ovh/gasser/newshapes/shapes/Shape.java
similarity index 67%
rename from src/main/java/ovh/gasser/rxshapes/shapes/Shape.java
rename to src/main/java/ovh/gasser/newshapes/shapes/Shape.java
index f1cdaae..d556fac 100644
--- a/src/main/java/ovh/gasser/rxshapes/shapes/Shape.java
+++ b/src/main/java/ovh/gasser/newshapes/shapes/Shape.java
@@ -1,7 +1,7 @@
-package ovh.gasser.rxshapes.shapes;
+package ovh.gasser.newshapes.shapes;
 
-import ovh.gasser.rxshapes.ShapeVisitor;
-import ovh.gasser.rxshapes.attributes.Attributes;
+import ovh.gasser.newshapes.ShapeVisitor;
+import ovh.gasser.newshapes.attributes.Attributes;
 
 import java.awt.*;
 
diff --git a/src/main/java/ovh/gasser/rxshapes/ui/Controller.java b/src/main/java/ovh/gasser/newshapes/ui/Controller.java
similarity index 89%
rename from src/main/java/ovh/gasser/rxshapes/ui/Controller.java
rename to src/main/java/ovh/gasser/newshapes/ui/Controller.java
index 37db7cc..fe14b55 100644
--- a/src/main/java/ovh/gasser/rxshapes/ui/Controller.java
+++ b/src/main/java/ovh/gasser/newshapes/ui/Controller.java
@@ -1,13 +1,12 @@
-package ovh.gasser.rxshapes.ui;
+package ovh.gasser.newshapes.ui;
 
-import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ovh.gasser.rxshapes.Selection;
-import ovh.gasser.rxshapes.util.EventSource;
-import ovh.gasser.rxshapes.shapes.Shape;
-import ovh.gasser.rxshapes.shapes.SCollection;
+import ovh.gasser.newshapes.Selection;
+import ovh.gasser.newshapes.util.EventSource;
+import ovh.gasser.newshapes.shapes.Shape;
+import ovh.gasser.newshapes.shapes.SCollection;
 
 import java.awt.event.MouseEvent;
 import java.util.Optional;
diff --git a/src/main/java/ovh/gasser/rxshapes/ui/ShapeDraftman.java b/src/main/java/ovh/gasser/newshapes/ui/ShapeDraftman.java
similarity index 83%
rename from src/main/java/ovh/gasser/rxshapes/ui/ShapeDraftman.java
rename to src/main/java/ovh/gasser/newshapes/ui/ShapeDraftman.java
index 2103ece..67427df 100644
--- a/src/main/java/ovh/gasser/rxshapes/ui/ShapeDraftman.java
+++ b/src/main/java/ovh/gasser/newshapes/ui/ShapeDraftman.java
@@ -1,11 +1,11 @@
-package ovh.gasser.rxshapes.ui;
+package ovh.gasser.newshapes.ui;
 
-import ovh.gasser.rxshapes.ShapeVisitor;
-import ovh.gasser.rxshapes.shapes.Shape;
-import ovh.gasser.rxshapes.attributes.ColorAttributes;
-import ovh.gasser.rxshapes.attributes.SelectionAttributes;
-import ovh.gasser.rxshapes.shapes.SCollection;
-import ovh.gasser.rxshapes.shapes.SRectangle;
+import ovh.gasser.newshapes.ShapeVisitor;
+import ovh.gasser.newshapes.shapes.Shape;
+import ovh.gasser.newshapes.attributes.ColorAttributes;
+import ovh.gasser.newshapes.attributes.SelectionAttributes;
+import ovh.gasser.newshapes.shapes.SCollection;
+import ovh.gasser.newshapes.shapes.SRectangle;
 
 import java.awt.*;
 
diff --git a/src/main/java/ovh/gasser/rxshapes/ui/ShapesView.java b/src/main/java/ovh/gasser/newshapes/ui/ShapesView.java
similarity index 84%
rename from src/main/java/ovh/gasser/rxshapes/ui/ShapesView.java
rename to src/main/java/ovh/gasser/newshapes/ui/ShapesView.java
index 710cbd2..110d83e 100644
--- a/src/main/java/ovh/gasser/rxshapes/ui/ShapesView.java
+++ b/src/main/java/ovh/gasser/newshapes/ui/ShapesView.java
@@ -1,9 +1,9 @@
-package ovh.gasser.rxshapes.ui;
+package ovh.gasser.newshapes.ui;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ovh.gasser.rxshapes.ShapeVisitor;
-import ovh.gasser.rxshapes.shapes.Shape;
+import ovh.gasser.newshapes.ShapeVisitor;
+import ovh.gasser.newshapes.shapes.Shape;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/ovh/gasser/rxshapes/ui/html/HTMLDraftman.java b/src/main/java/ovh/gasser/newshapes/ui/html/HTMLDraftman.java
similarity index 92%
rename from src/main/java/ovh/gasser/rxshapes/ui/html/HTMLDraftman.java
rename to src/main/java/ovh/gasser/newshapes/ui/html/HTMLDraftman.java
index 4808c08..d55a073 100644
--- a/src/main/java/ovh/gasser/rxshapes/ui/html/HTMLDraftman.java
+++ b/src/main/java/ovh/gasser/newshapes/ui/html/HTMLDraftman.java
@@ -1,9 +1,9 @@
-package ovh.gasser.rxshapes.ui.html;
+package ovh.gasser.newshapes.ui.html;
 
-import ovh.gasser.rxshapes.ShapeVisitor;
-import ovh.gasser.rxshapes.attributes.ColorAttributes;
-import ovh.gasser.rxshapes.shapes.SCollection;
-import ovh.gasser.rxshapes.shapes.SRectangle;
+import ovh.gasser.newshapes.ShapeVisitor;
+import ovh.gasser.newshapes.attributes.ColorAttributes;
+import ovh.gasser.newshapes.shapes.SCollection;
+import ovh.gasser.newshapes.shapes.SRectangle;
 
 import java.awt.*;
 import java.io.PrintWriter;
diff --git a/src/main/java/ovh/gasser/rxshapes/util/EventSource.java b/src/main/java/ovh/gasser/newshapes/util/EventSource.java
similarity index 92%
rename from src/main/java/ovh/gasser/rxshapes/util/EventSource.java
rename to src/main/java/ovh/gasser/newshapes/util/EventSource.java
index 58a93c8..b95103b 100644
--- a/src/main/java/ovh/gasser/rxshapes/util/EventSource.java
+++ b/src/main/java/ovh/gasser/newshapes/util/EventSource.java
@@ -1,11 +1,10 @@
-package ovh.gasser.rxshapes.util;
+package ovh.gasser.newshapes.util;
 
 import io.reactivex.Observable;
 
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.concurrent.Future;
 
 public class EventSource {
     public static Observable<MouseEvent> fromMouseEventsOf(final Component component) {
diff --git a/src/main/java/ovh/gasser/rxshapes/util/Streamable.java b/src/main/java/ovh/gasser/newshapes/util/Streamable.java
similarity index 86%
rename from src/main/java/ovh/gasser/rxshapes/util/Streamable.java
rename to src/main/java/ovh/gasser/newshapes/util/Streamable.java
index afd2835..95ba95e 100644
--- a/src/main/java/ovh/gasser/rxshapes/util/Streamable.java
+++ b/src/main/java/ovh/gasser/newshapes/util/Streamable.java
@@ -1,4 +1,4 @@
-package ovh.gasser.rxshapes.util;
+package ovh.gasser.newshapes.util;
 
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;