diff --git a/out/production/examples/MidiSimple$MidiInputReceiver.class b/out/production/examples/MidiSimple$MidiInputReceiver.class
new file mode 100644
index 0000000..6d8c075
Binary files /dev/null and b/out/production/examples/MidiSimple$MidiInputReceiver.class differ
diff --git a/out/production/examples/MidiSimple.class b/out/production/examples/MidiSimple.class
new file mode 100644
index 0000000..96f7f57
Binary files /dev/null and b/out/production/examples/MidiSimple.class differ
diff --git a/src/main/java/controlP5/Accordion.java b/src/main/java/controlP5/Accordion.java
index 0dfc847..09784b9 100755
--- a/src/main/java/controlP5/Accordion.java
+++ b/src/main/java/controlP5/Accordion.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Background.java b/src/main/java/controlP5/Background.java
index aa4646b..a454509 100644
--- a/src/main/java/controlP5/Background.java
+++ b/src/main/java/controlP5/Background.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Bang.java b/src/main/java/controlP5/Bang.java
index 527c27b..ff8bfc1 100755
--- a/src/main/java/controlP5/Bang.java
+++ b/src/main/java/controlP5/Bang.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/BitFont.java b/src/main/java/controlP5/BitFont.java
index be89f61..15bec01 100755
--- a/src/main/java/controlP5/BitFont.java
+++ b/src/main/java/controlP5/BitFont.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Button.java b/src/main/java/controlP5/Button.java
index 35850d6..37ca48b 100755
--- a/src/main/java/controlP5/Button.java
+++ b/src/main/java/controlP5/Button.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ButtonBar.java b/src/main/java/controlP5/ButtonBar.java
index 1ad3a0b..8b9f378 100644
--- a/src/main/java/controlP5/ButtonBar.java
+++ b/src/main/java/controlP5/ButtonBar.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 
 /**
diff --git a/src/main/java/controlP5/CColor.java b/src/main/java/controlP5/CColor.java
index 7d78fb7..8de9a80 100755
--- a/src/main/java/controlP5/CColor.java
+++ b/src/main/java/controlP5/CColor.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/CDrawable.java b/src/main/java/controlP5/CDrawable.java
index dc8f46b..9fbe46a 100755
--- a/src/main/java/controlP5/CDrawable.java
+++ b/src/main/java/controlP5/CDrawable.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/CP.java b/src/main/java/controlP5/CP.java
index 9f4f6dc..1a867ff 100755
--- a/src/main/java/controlP5/CP.java
+++ b/src/main/java/controlP5/CP.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/CallbackEvent.java b/src/main/java/controlP5/CallbackEvent.java
index 3845c4c..7fde0b1 100755
--- a/src/main/java/controlP5/CallbackEvent.java
+++ b/src/main/java/controlP5/CallbackEvent.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/CallbackListener.java b/src/main/java/controlP5/CallbackListener.java
index 0c2c3f1..a4ad65f 100755
--- a/src/main/java/controlP5/CallbackListener.java
+++ b/src/main/java/controlP5/CallbackListener.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Canvas.java b/src/main/java/controlP5/Canvas.java
index 37af835..0533214 100755
--- a/src/main/java/controlP5/Canvas.java
+++ b/src/main/java/controlP5/Canvas.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Chart.java b/src/main/java/controlP5/Chart.java
index 229d0b0..7b77ee6 100755
--- a/src/main/java/controlP5/Chart.java
+++ b/src/main/java/controlP5/Chart.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ChartData.java b/src/main/java/controlP5/ChartData.java
index 45933af..45dfafd 100755
--- a/src/main/java/controlP5/ChartData.java
+++ b/src/main/java/controlP5/ChartData.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ChartDataSet.java b/src/main/java/controlP5/ChartDataSet.java
index 51b7e8e..323ab33 100755
--- a/src/main/java/controlP5/ChartDataSet.java
+++ b/src/main/java/controlP5/ChartDataSet.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/CheckBox.java b/src/main/java/controlP5/CheckBox.java
index a6a680c..97255d4 100755
--- a/src/main/java/controlP5/CheckBox.java
+++ b/src/main/java/controlP5/CheckBox.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ColorPalette.java b/src/main/java/controlP5/ColorPalette.java
index 089eace..05fd20e 100644
--- a/src/main/java/controlP5/ColorPalette.java
+++ b/src/main/java/controlP5/ColorPalette.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ColorPicker.java b/src/main/java/controlP5/ColorPicker.java
index aad9ad8..314bde5 100755
--- a/src/main/java/controlP5/ColorPicker.java
+++ b/src/main/java/controlP5/ColorPicker.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ColorWheel.java b/src/main/java/controlP5/ColorWheel.java
index 691ff4a..c7d1dee 100644
--- a/src/main/java/controlP5/ColorWheel.java
+++ b/src/main/java/controlP5/ColorWheel.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlBehavior.java b/src/main/java/controlP5/ControlBehavior.java
index df64724..25b5c5f 100755
--- a/src/main/java/controlP5/ControlBehavior.java
+++ b/src/main/java/controlP5/ControlBehavior.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlBroadcaster.java b/src/main/java/controlP5/ControlBroadcaster.java
index 0b3db43..1863e1f 100755
--- a/src/main/java/controlP5/ControlBroadcaster.java
+++ b/src/main/java/controlP5/ControlBroadcaster.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlElement.java b/src/main/java/controlP5/ControlElement.java
index 2000efe..7da0d48 100755
--- a/src/main/java/controlP5/ControlElement.java
+++ b/src/main/java/controlP5/ControlElement.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlEvent.java b/src/main/java/controlP5/ControlEvent.java
index 106320b..5b3cf97 100755
--- a/src/main/java/controlP5/ControlEvent.java
+++ b/src/main/java/controlP5/ControlEvent.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlFont.java b/src/main/java/controlP5/ControlFont.java
index 2cbe34e..53d553b 100755
--- a/src/main/java/controlP5/ControlFont.java
+++ b/src/main/java/controlP5/ControlFont.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlGroup.java b/src/main/java/controlP5/ControlGroup.java
index 9591cde..9ddfc66 100755
--- a/src/main/java/controlP5/ControlGroup.java
+++ b/src/main/java/controlP5/ControlGroup.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlKey.java b/src/main/java/controlP5/ControlKey.java
index 29fedb1..81f930e 100755
--- a/src/main/java/controlP5/ControlKey.java
+++ b/src/main/java/controlP5/ControlKey.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlListener.java b/src/main/java/controlP5/ControlListener.java
index e8d37cf..e93c71c 100755
--- a/src/main/java/controlP5/ControlListener.java
+++ b/src/main/java/controlP5/ControlListener.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlP5.java b/src/main/java/controlP5/ControlP5.java
index eeaa172..4a975fb 100755
--- a/src/main/java/controlP5/ControlP5.java
+++ b/src/main/java/controlP5/ControlP5.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
@@ -50,7 +50,7 @@ import processing.core.PFont;
 import processing.core.PGraphics;
 import processing.event.KeyEvent;
 import processing.event.MouseEvent;
-import main.java.controlp5.ControlWindow.Pointer;
+import controlP5.ControlWindow.Pointer;
 
 /**
  * <p>
diff --git a/src/main/java/controlP5/ControlP5Base.java b/src/main/java/controlP5/ControlP5Base.java
index 0e2e4a2..241a4f6 100755
--- a/src/main/java/controlP5/ControlP5Base.java
+++ b/src/main/java/controlP5/ControlP5Base.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlP5Constants.java b/src/main/java/controlP5/ControlP5Constants.java
index a48af46..e4f93d9 100755
--- a/src/main/java/controlP5/ControlP5Constants.java
+++ b/src/main/java/controlP5/ControlP5Constants.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlP5Legacy.java b/src/main/java/controlP5/ControlP5Legacy.java
index 235fc97..f44b893 100644
--- a/src/main/java/controlP5/ControlP5Legacy.java
+++ b/src/main/java/controlP5/ControlP5Legacy.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlTimer.java b/src/main/java/controlP5/ControlTimer.java
index 5af97bb..5a93fb4 100755
--- a/src/main/java/controlP5/ControlTimer.java
+++ b/src/main/java/controlP5/ControlTimer.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlWindow.java b/src/main/java/controlP5/ControlWindow.java
index 07dc421..6f450ba 100755
--- a/src/main/java/controlP5/ControlWindow.java
+++ b/src/main/java/controlP5/ControlWindow.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControlWindowCanvas.java b/src/main/java/controlP5/ControlWindowCanvas.java
index e0e8219..2a322aa 100755
--- a/src/main/java/controlP5/ControlWindowCanvas.java
+++ b/src/main/java/controlP5/ControlWindowCanvas.java
@@ -1,5 +1,5 @@
 
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Controller.java b/src/main/java/controlP5/Controller.java
index 89d64c0..39ecc01 100755
--- a/src/main/java/controlP5/Controller.java
+++ b/src/main/java/controlP5/Controller.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControllerAutomator.java b/src/main/java/controlP5/ControllerAutomator.java
index d24410d..25b0863 100755
--- a/src/main/java/controlP5/ControllerAutomator.java
+++ b/src/main/java/controlP5/ControllerAutomator.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControllerDisplay.java b/src/main/java/controlP5/ControllerDisplay.java
index 3a35d65..768ace2 100755
--- a/src/main/java/controlP5/ControllerDisplay.java
+++ b/src/main/java/controlP5/ControllerDisplay.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControllerGroup.java b/src/main/java/controlP5/ControllerGroup.java
index c7e332a..53cee10 100755
--- a/src/main/java/controlP5/ControllerGroup.java
+++ b/src/main/java/controlP5/ControllerGroup.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControllerInterface.java b/src/main/java/controlP5/ControllerInterface.java
index 3c1c226..6a4a355 100755
--- a/src/main/java/controlP5/ControllerInterface.java
+++ b/src/main/java/controlP5/ControllerInterface.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControllerLayout.java b/src/main/java/controlP5/ControllerLayout.java
index b7d1eac..29eda66 100755
--- a/src/main/java/controlP5/ControllerLayout.java
+++ b/src/main/java/controlP5/ControllerLayout.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControllerLayoutElement.java b/src/main/java/controlP5/ControllerLayoutElement.java
index 34c6ea7..d59b07f 100755
--- a/src/main/java/controlP5/ControllerLayoutElement.java
+++ b/src/main/java/controlP5/ControllerLayoutElement.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControllerList.java b/src/main/java/controlP5/ControllerList.java
index 8d2d4b6..ddc9f78 100755
--- a/src/main/java/controlP5/ControllerList.java
+++ b/src/main/java/controlP5/ControllerList.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControllerPlug.java b/src/main/java/controlP5/ControllerPlug.java
index 9846133..9c350b1 100755
--- a/src/main/java/controlP5/ControllerPlug.java
+++ b/src/main/java/controlP5/ControllerPlug.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControllerProperties.java b/src/main/java/controlP5/ControllerProperties.java
index 8a179a4..d5ba746 100755
--- a/src/main/java/controlP5/ControllerProperties.java
+++ b/src/main/java/controlP5/ControllerProperties.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControllerProperty.java b/src/main/java/controlP5/ControllerProperty.java
index ab85716..f068fe6 100755
--- a/src/main/java/controlP5/ControllerProperty.java
+++ b/src/main/java/controlP5/ControllerProperty.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControllerStyle.java b/src/main/java/controlP5/ControllerStyle.java
index 93d1fce..3a0e826 100755
--- a/src/main/java/controlP5/ControllerStyle.java
+++ b/src/main/java/controlP5/ControllerStyle.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ControllerView.java b/src/main/java/controlP5/ControllerView.java
index 827d1c4..ca0f9d7 100755
--- a/src/main/java/controlP5/ControllerView.java
+++ b/src/main/java/controlP5/ControllerView.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/DropdownList.java b/src/main/java/controlP5/DropdownList.java
index 6d29163..957ad77 100755
--- a/src/main/java/controlP5/DropdownList.java
+++ b/src/main/java/controlP5/DropdownList.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 import static main.java.controlp5.ControlP5.b;
 
diff --git a/src/main/java/controlP5/FieldChangedListener.java b/src/main/java/controlP5/FieldChangedListener.java
index 0e2f6b0..85b9b1f 100755
--- a/src/main/java/controlP5/FieldChangedListener.java
+++ b/src/main/java/controlP5/FieldChangedListener.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/FrameRate.java b/src/main/java/controlP5/FrameRate.java
index 881f68d..b816618 100755
--- a/src/main/java/controlP5/FrameRate.java
+++ b/src/main/java/controlP5/FrameRate.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Group.java b/src/main/java/controlP5/Group.java
index 9680e68..fb661d1 100755
--- a/src/main/java/controlP5/Group.java
+++ b/src/main/java/controlP5/Group.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Icon.java b/src/main/java/controlP5/Icon.java
index ccaa6a3..540e8f5 100644
--- a/src/main/java/controlP5/Icon.java
+++ b/src/main/java/controlP5/Icon.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Knob.java b/src/main/java/controlP5/Knob.java
index 2a766af..a51c7bd 100755
--- a/src/main/java/controlP5/Knob.java
+++ b/src/main/java/controlP5/Knob.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Label.java b/src/main/java/controlP5/Label.java
index 9cb0e7b..c9d295d 100755
--- a/src/main/java/controlP5/Label.java
+++ b/src/main/java/controlP5/Label.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ListBox.java b/src/main/java/controlP5/ListBox.java
index 51e234f..ed4f1b3 100755
--- a/src/main/java/controlP5/ListBox.java
+++ b/src/main/java/controlP5/ListBox.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Matrix.java b/src/main/java/controlP5/Matrix.java
index 31f3f8c..a7271e5 100755
--- a/src/main/java/controlP5/Matrix.java
+++ b/src/main/java/controlP5/Matrix.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/MultiList.java b/src/main/java/controlP5/MultiList.java
index 6641592..6260322 100755
--- a/src/main/java/controlP5/MultiList.java
+++ b/src/main/java/controlP5/MultiList.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/MultiListButton.java b/src/main/java/controlP5/MultiListButton.java
index 2ad286c..76266aa 100755
--- a/src/main/java/controlP5/MultiListButton.java
+++ b/src/main/java/controlP5/MultiListButton.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/MultiListInterface.java b/src/main/java/controlP5/MultiListInterface.java
index 78fcd1f..3509731 100755
--- a/src/main/java/controlP5/MultiListInterface.java
+++ b/src/main/java/controlP5/MultiListInterface.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/MultilineTextfield.java b/src/main/java/controlP5/MultilineTextfield.java
index 54ee4f3..41eb2a9 100644
--- a/src/main/java/controlP5/MultilineTextfield.java
+++ b/src/main/java/controlP5/MultilineTextfield.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 import processing.event.KeyEvent;
 
diff --git a/src/main/java/controlP5/Numberbox.java b/src/main/java/controlP5/Numberbox.java
index ee763f1..4e6e197 100755
--- a/src/main/java/controlP5/Numberbox.java
+++ b/src/main/java/controlP5/Numberbox.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Pad.java b/src/main/java/controlP5/Pad.java
index e6233f7..382cd3d 100755
--- a/src/main/java/controlP5/Pad.java
+++ b/src/main/java/controlP5/Pad.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Pointer.java b/src/main/java/controlP5/Pointer.java
index e7740f6..c8ba02b 100755
--- a/src/main/java/controlP5/Pointer.java
+++ b/src/main/java/controlP5/Pointer.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Println.java b/src/main/java/controlP5/Println.java
index ea3ef53..787866e 100755
--- a/src/main/java/controlP5/Println.java
+++ b/src/main/java/controlP5/Println.java
@@ -1,5 +1,5 @@
 
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Radio.java b/src/main/java/controlP5/Radio.java
index 92cf28a..31c1c91 100755
--- a/src/main/java/controlP5/Radio.java
+++ b/src/main/java/controlP5/Radio.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/RadioButton.java b/src/main/java/controlP5/RadioButton.java
index b1bd697..3978361 100755
--- a/src/main/java/controlP5/RadioButton.java
+++ b/src/main/java/controlP5/RadioButton.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Range.java b/src/main/java/controlP5/Range.java
index 81c1f49..3f742c7 100755
--- a/src/main/java/controlP5/Range.java
+++ b/src/main/java/controlP5/Range.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/ScrollableList.java b/src/main/java/controlP5/ScrollableList.java
index fd219ac..dafb645 100644
--- a/src/main/java/controlP5/ScrollableList.java
+++ b/src/main/java/controlP5/ScrollableList.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Slider.java b/src/main/java/controlP5/Slider.java
index cea4232..580ca7b 100755
--- a/src/main/java/controlP5/Slider.java
+++ b/src/main/java/controlP5/Slider.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Slider2D.java b/src/main/java/controlP5/Slider2D.java
index 4312403..652c8fe 100755
--- a/src/main/java/controlP5/Slider2D.java
+++ b/src/main/java/controlP5/Slider2D.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Spacer.java b/src/main/java/controlP5/Spacer.java
index 034a68c..f7b384a 100644
--- a/src/main/java/controlP5/Spacer.java
+++ b/src/main/java/controlP5/Spacer.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Tab.java b/src/main/java/controlP5/Tab.java
index 2460919..70f6e78 100755
--- a/src/main/java/controlP5/Tab.java
+++ b/src/main/java/controlP5/Tab.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Textarea.java b/src/main/java/controlP5/Textarea.java
index e1d5930..fb01036 100755
--- a/src/main/java/controlP5/Textarea.java
+++ b/src/main/java/controlP5/Textarea.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Textfield.java b/src/main/java/controlP5/Textfield.java
index 61c7c07..d6f279f 100755
--- a/src/main/java/controlP5/Textfield.java
+++ b/src/main/java/controlP5/Textfield.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/TextfieldCommand.java b/src/main/java/controlP5/TextfieldCommand.java
index b8e586f..adb89a1 100644
--- a/src/main/java/controlP5/TextfieldCommand.java
+++ b/src/main/java/controlP5/TextfieldCommand.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 public interface TextfieldCommand {
     void execute( );
diff --git a/src/main/java/controlP5/Textlabel.java b/src/main/java/controlP5/Textlabel.java
index 89a0285..f0742ba 100755
--- a/src/main/java/controlP5/Textlabel.java
+++ b/src/main/java/controlP5/Textlabel.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/TickMark.java b/src/main/java/controlP5/TickMark.java
index b869aec..2ff66fb 100755
--- a/src/main/java/controlP5/TickMark.java
+++ b/src/main/java/controlP5/TickMark.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Toggle.java b/src/main/java/controlP5/Toggle.java
index c55147b..490791d 100755
--- a/src/main/java/controlP5/Toggle.java
+++ b/src/main/java/controlP5/Toggle.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/Tooltip.java b/src/main/java/controlP5/Tooltip.java
index 7afeece..66e7a72 100755
--- a/src/main/java/controlP5/Tooltip.java
+++ b/src/main/java/controlP5/Tooltip.java
@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.
diff --git a/src/main/java/controlP5/events/ReleasedOutsideListener.java b/src/main/java/controlP5/events/ReleasedOutsideListener.java
index cb9c2a9..a5f05dd 100644
--- a/src/main/java/controlP5/events/ReleasedOutsideListener.java
+++ b/src/main/java/controlP5/events/ReleasedOutsideListener.java
@@ -1,4 +1,4 @@
-package main.java.controlp5.events;
+package controlP5.events;
 
 public interface ReleasedOutsideListener {
     public void mouseReleasedOutside( ) ;
diff --git a/src/main/java/controlP5/layout/ControllerFactory.java b/src/main/java/controlP5/layout/ControllerFactory.java
index 5a0f182..3a57b56 100644
--- a/src/main/java/controlP5/layout/ControllerFactory.java
+++ b/src/main/java/controlP5/layout/ControllerFactory.java
@@ -1,4 +1,4 @@
-package main.java.controlp5.layout;
+package controlP5.layout;
 
 import controlP5.*;
 import main.java.controlp5.layout.lang.XMLParser;
diff --git a/src/main/java/controlP5/layout/LayoutBuilder.java b/src/main/java/controlP5/layout/LayoutBuilder.java
index c8c970d..a870bed 100644
--- a/src/main/java/controlP5/layout/LayoutBuilder.java
+++ b/src/main/java/controlP5/layout/LayoutBuilder.java
@@ -1,4 +1,4 @@
-package main.java.controlp5.layout;
+package controlP5.layout;
 
 
 import main.java.controlp5.ControlP5;
diff --git a/src/main/java/controlP5/layout/lang/XMLBaseListener.java b/src/main/java/controlP5/layout/lang/XMLBaseListener.java
index cc1b35c..00befed 100644
--- a/src/main/java/controlP5/layout/lang/XMLBaseListener.java
+++ b/src/main/java/controlP5/layout/lang/XMLBaseListener.java
@@ -1,5 +1,5 @@
 // Generated from XML.g4 by ANTLR 4.13.0
-package main.java.controlp5.layout.lang;
+package controlP5.layout.lang;
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ErrorNode;
diff --git a/src/main/java/controlP5/layout/lang/XMLBaseVisitor.java b/src/main/java/controlP5/layout/lang/XMLBaseVisitor.java
index c858cfe..07fbb5b 100644
--- a/src/main/java/controlP5/layout/lang/XMLBaseVisitor.java
+++ b/src/main/java/controlP5/layout/lang/XMLBaseVisitor.java
@@ -1,5 +1,5 @@
 // Generated from XML.g4 by ANTLR 4.13.0
-package main.java.controlp5.layout.lang;
+package controlP5.layout.lang;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 
 /**
diff --git a/src/main/java/controlP5/layout/lang/XMLLexer.java b/src/main/java/controlP5/layout/lang/XMLLexer.java
index 80a4f8b..f634b64 100644
--- a/src/main/java/controlP5/layout/lang/XMLLexer.java
+++ b/src/main/java/controlP5/layout/lang/XMLLexer.java
@@ -1,5 +1,5 @@
 // Generated from XML.g4 by ANTLR 4.13.0
-package main.java.controlp5.layout.lang;
+package controlP5.layout.lang;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Token;
diff --git a/src/main/java/controlP5/layout/lang/XMLListener.java b/src/main/java/controlP5/layout/lang/XMLListener.java
index fab5eb9..affbd5b 100644
--- a/src/main/java/controlP5/layout/lang/XMLListener.java
+++ b/src/main/java/controlP5/layout/lang/XMLListener.java
@@ -1,5 +1,5 @@
 // Generated from XML.g4 by ANTLR 4.13.0
-package main.java.controlp5.layout.lang;
+package controlP5.layout.lang;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 
 /**
diff --git a/src/main/java/controlP5/layout/lang/XMLParser.java b/src/main/java/controlP5/layout/lang/XMLParser.java
index b8a3e5b..1aa8d3c 100644
--- a/src/main/java/controlP5/layout/lang/XMLParser.java
+++ b/src/main/java/controlP5/layout/lang/XMLParser.java
@@ -1,5 +1,5 @@
 // Generated from XML.g4 by ANTLR 4.13.0
-package main.java.controlp5.layout.lang;
+package controlP5.layout.lang;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
 import org.antlr.v4.runtime.*;
diff --git a/src/main/java/controlP5/layout/lang/XMLVisitor.java b/src/main/java/controlP5/layout/lang/XMLVisitor.java
index 04189a6..4b8fd76 100644
--- a/src/main/java/controlP5/layout/lang/XMLVisitor.java
+++ b/src/main/java/controlP5/layout/lang/XMLVisitor.java
@@ -1,5 +1,5 @@
 // Generated from XML.g4 by ANTLR 4.13.0
-package main.java.controlp5.layout.lang;
+package controlP5.layout.lang;
 import org.antlr.v4.runtime.tree.ParseTreeVisitor;
 
 /**
diff --git a/src/main/java/sketch/Sketch.java b/src/main/java/sketch/Sketch.java
index 4872537..7f9d915 100644
--- a/src/main/java/sketch/Sketch.java
+++ b/src/main/java/sketch/Sketch.java
@@ -1,16 +1,17 @@
-package main.java.sketch;
+package sketch;
 
 
-import main.java.controlp5.Button;
-import main.java.controlp5.ControlP5;
-import main.java.controlp5.MultilineTextfield;
+
+import controlP5.Button;
+import controlP5.ControlP5;
+import controlP5.MultilineTextfield;
 import processing.core.PApplet;
 
 public class Sketch extends PApplet {
 
     static public void main (String[] args){
 
-        PApplet.main("main.java.sketch.Sketch");
+        PApplet.main("sketch.Sketch");
     }
 
     ControlP5 cp5;
diff --git a/target/classes/controlP5/ButtonBar$ButtonBarView.class b/target/classes/controlP5/ButtonBar$ButtonBarView.class
index 0324ed8..f0389d9 100644
Binary files a/target/classes/controlP5/ButtonBar$ButtonBarView.class and b/target/classes/controlP5/ButtonBar$ButtonBarView.class differ
diff --git a/target/classes/controlP5/CColor.class b/target/classes/controlP5/CColor.class
index 0d15d15..66abd9b 100644
Binary files a/target/classes/controlP5/CColor.class and b/target/classes/controlP5/CColor.class differ
diff --git a/target/classes/controlP5/ControlP5Base.class b/target/classes/controlP5/ControlP5Base.class
index 7619c22..6140c9c 100644
Binary files a/target/classes/controlP5/ControlP5Base.class and b/target/classes/controlP5/ControlP5Base.class differ
diff --git a/target/classes/controlP5/ControlP5Legacy.class b/target/classes/controlP5/ControlP5Legacy.class
index 770776e..2954d49 100644
Binary files a/target/classes/controlP5/ControlP5Legacy.class and b/target/classes/controlP5/ControlP5Legacy.class differ
diff --git a/target/classes/controlP5/ControlWindow$Pointer.class b/target/classes/controlP5/ControlWindow$Pointer.class
index e3e8159..2313b9e 100644
Binary files a/target/classes/controlP5/ControlWindow$Pointer.class and b/target/classes/controlP5/ControlWindow$Pointer.class differ
diff --git a/target/classes/controlP5/ControlWindow.class b/target/classes/controlP5/ControlWindow.class
index 99641b8..f5bea2e 100644
Binary files a/target/classes/controlP5/ControlWindow.class and b/target/classes/controlP5/ControlWindow.class differ
diff --git a/target/classes/controlP5/Controller$DebugView.class b/target/classes/controlP5/Controller$DebugView.class
index c024745..0119d7e 100644
Binary files a/target/classes/controlP5/Controller$DebugView.class and b/target/classes/controlP5/Controller$DebugView.class differ
diff --git a/target/classes/controlP5/Controller.class b/target/classes/controlP5/Controller.class
index b3fd020..2bddfb5 100644
Binary files a/target/classes/controlP5/Controller.class and b/target/classes/controlP5/Controller.class differ
diff --git a/target/classes/controlP5/ControllerLayoutElement.class b/target/classes/controlP5/ControllerLayoutElement.class
index 153386a..7e34f01 100644
Binary files a/target/classes/controlP5/ControllerLayoutElement.class and b/target/classes/controlP5/ControllerLayoutElement.class differ
diff --git a/target/classes/controlP5/ControllerProperties$JSONFormat.class b/target/classes/controlP5/ControllerProperties$JSONFormat.class
index 3b53144..8e118a2 100644
Binary files a/target/classes/controlP5/ControllerProperties$JSONFormat.class and b/target/classes/controlP5/ControllerProperties$JSONFormat.class differ
diff --git a/target/classes/controlP5/ControllerProperties$JSONReader.class b/target/classes/controlP5/ControllerProperties$JSONReader.class
index 940e922..321f032 100644
Binary files a/target/classes/controlP5/ControllerProperties$JSONReader.class and b/target/classes/controlP5/ControllerProperties$JSONReader.class differ
diff --git a/target/classes/controlP5/ControllerProperties$SerializedFormat.class b/target/classes/controlP5/ControllerProperties$SerializedFormat.class
index a69b53b..7b5b647 100644
Binary files a/target/classes/controlP5/ControllerProperties$SerializedFormat.class and b/target/classes/controlP5/ControllerProperties$SerializedFormat.class differ
diff --git a/target/classes/controlP5/ControllerProperties$XMLFormat.class b/target/classes/controlP5/ControllerProperties$XMLFormat.class
index 13d880c..e003a78 100644
Binary files a/target/classes/controlP5/ControllerProperties$XMLFormat.class and b/target/classes/controlP5/ControllerProperties$XMLFormat.class differ
diff --git a/target/classes/controlP5/ControllerProperties.class b/target/classes/controlP5/ControllerProperties.class
index 7ca1c4a..8b2a925 100644
Binary files a/target/classes/controlP5/ControllerProperties.class and b/target/classes/controlP5/ControllerProperties.class differ
diff --git a/target/classes/controlP5/Knob$KnobView.class b/target/classes/controlP5/Knob$KnobView.class
index 7780301..6d67fbc 100644
Binary files a/target/classes/controlP5/Knob$KnobView.class and b/target/classes/controlP5/Knob$KnobView.class differ
diff --git a/target/classes/controlP5/MultiListButton.class b/target/classes/controlP5/MultiListButton.class
index d96c697..283cf3f 100644
Binary files a/target/classes/controlP5/MultiListButton.class and b/target/classes/controlP5/MultiListButton.class differ
diff --git a/target/classes/controlP5/Range.class b/target/classes/controlP5/Range.class
index d2832a5..01d73d7 100644
Binary files a/target/classes/controlP5/Range.class and b/target/classes/controlP5/Range.class differ
diff --git a/target/classes/controlP5/ScrollableList$ScrollableListView.class b/target/classes/controlP5/ScrollableList$ScrollableListView.class
index 515719b..ea6ec82 100644
Binary files a/target/classes/controlP5/ScrollableList$ScrollableListView.class and b/target/classes/controlP5/ScrollableList$ScrollableListView.class differ
diff --git a/target/classes/controlP5/Textfield$DeleteCharacter.class b/target/classes/controlP5/Textfield$DeleteCharacter.class
index 99fc4d5..c3abe7e 100644
Binary files a/target/classes/controlP5/Textfield$DeleteCharacter.class and b/target/classes/controlP5/Textfield$DeleteCharacter.class differ
diff --git a/target/classes/controlP5/Textfield$Enter.class b/target/classes/controlP5/Textfield$Enter.class
index 6b67194..eea4cba 100644
Binary files a/target/classes/controlP5/Textfield$Enter.class and b/target/classes/controlP5/Textfield$Enter.class differ
diff --git a/target/classes/controlP5/Textfield$InputFilter.class b/target/classes/controlP5/Textfield$InputFilter.class
index b90952f..77469bd 100644
Binary files a/target/classes/controlP5/Textfield$InputFilter.class and b/target/classes/controlP5/Textfield$InputFilter.class differ
diff --git a/target/classes/controlP5/Textfield$InsertCharacter.class b/target/classes/controlP5/Textfield$InsertCharacter.class
index 083665c..5628382 100644
Binary files a/target/classes/controlP5/Textfield$InsertCharacter.class and b/target/classes/controlP5/Textfield$InsertCharacter.class differ
diff --git a/target/classes/controlP5/Textfield$MoveDown.class b/target/classes/controlP5/Textfield$MoveDown.class
index 86aed9f..33bd872 100644
Binary files a/target/classes/controlP5/Textfield$MoveDown.class and b/target/classes/controlP5/Textfield$MoveDown.class differ
diff --git a/target/classes/controlP5/Textfield$MoveLeft.class b/target/classes/controlP5/Textfield$MoveLeft.class
index 2a0a273..1000a90 100644
Binary files a/target/classes/controlP5/Textfield$MoveLeft.class and b/target/classes/controlP5/Textfield$MoveLeft.class differ
diff --git a/target/classes/controlP5/Textfield$MoveRight.class b/target/classes/controlP5/Textfield$MoveRight.class
index c357a56..56b1158 100644
Binary files a/target/classes/controlP5/Textfield$MoveRight.class and b/target/classes/controlP5/Textfield$MoveRight.class differ
diff --git a/target/classes/controlP5/Textfield$MoveUp.class b/target/classes/controlP5/Textfield$MoveUp.class
index 1801a14..77581c9 100644
Binary files a/target/classes/controlP5/Textfield$MoveUp.class and b/target/classes/controlP5/Textfield$MoveUp.class differ
diff --git a/target/classes/controlP5/Textfield.class b/target/classes/controlP5/Textfield.class
index 0496302..efcc9e2 100644
Binary files a/target/classes/controlP5/Textfield.class and b/target/classes/controlP5/Textfield.class differ
diff --git a/target/classes/controlP5/TextfieldCommand.class b/target/classes/controlP5/TextfieldCommand.class
new file mode 100644
index 0000000..ff798f4
Binary files /dev/null and b/target/classes/controlP5/TextfieldCommand.class differ
diff --git a/target/classes/controlP5/layout/ControllerFactory.class b/target/classes/controlP5/layout/ControllerFactory.class
new file mode 100644
index 0000000..7bd10bf
Binary files /dev/null and b/target/classes/controlP5/layout/ControllerFactory.class differ
diff --git a/target/classes/controlP5/layout/LayoutBuilder$Attribute.class b/target/classes/controlP5/layout/LayoutBuilder$Attribute.class
new file mode 100644
index 0000000..5379734
Binary files /dev/null and b/target/classes/controlP5/layout/LayoutBuilder$Attribute.class differ
diff --git a/target/classes/controlP5/layout/LayoutBuilder$ElementProps.class b/target/classes/controlP5/layout/LayoutBuilder$ElementProps.class
new file mode 100644
index 0000000..9247caf
Binary files /dev/null and b/target/classes/controlP5/layout/LayoutBuilder$ElementProps.class differ
diff --git a/target/classes/controlP5/layout/LayoutBuilder$Tag.class b/target/classes/controlP5/layout/LayoutBuilder$Tag.class
new file mode 100644
index 0000000..e9b6510
Binary files /dev/null and b/target/classes/controlP5/layout/LayoutBuilder$Tag.class differ
diff --git a/target/classes/controlP5/layout/LayoutBuilder$XMLVisitor.class b/target/classes/controlP5/layout/LayoutBuilder$XMLVisitor.class
new file mode 100644
index 0000000..0d231a4
Binary files /dev/null and b/target/classes/controlP5/layout/LayoutBuilder$XMLVisitor.class differ
diff --git a/target/classes/controlP5/layout/LayoutBuilder.class b/target/classes/controlP5/layout/LayoutBuilder.class
new file mode 100644
index 0000000..ac33854
Binary files /dev/null and b/target/classes/controlP5/layout/LayoutBuilder.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLBaseListener.class b/target/classes/controlP5/layout/lang/XMLBaseListener.class
new file mode 100644
index 0000000..b45446d
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLBaseListener.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLBaseVisitor.class b/target/classes/controlP5/layout/lang/XMLBaseVisitor.class
new file mode 100644
index 0000000..d8f3fcf
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLBaseVisitor.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLLexer.class b/target/classes/controlP5/layout/lang/XMLLexer.class
new file mode 100644
index 0000000..cbea678
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLLexer.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLListener.class b/target/classes/controlP5/layout/lang/XMLListener.class
new file mode 100644
index 0000000..9257147
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLListener.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLParser$AttributeContext.class b/target/classes/controlP5/layout/lang/XMLParser$AttributeContext.class
new file mode 100644
index 0000000..d21927f
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLParser$AttributeContext.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLParser$ContentContext.class b/target/classes/controlP5/layout/lang/XMLParser$ContentContext.class
new file mode 100644
index 0000000..e04877d
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLParser$ContentContext.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLParser$DocumentContext.class b/target/classes/controlP5/layout/lang/XMLParser$DocumentContext.class
new file mode 100644
index 0000000..092d967
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLParser$DocumentContext.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLParser$ElementContext.class b/target/classes/controlP5/layout/lang/XMLParser$ElementContext.class
new file mode 100644
index 0000000..61fbcb1
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLParser$ElementContext.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLParser$EndTagContext.class b/target/classes/controlP5/layout/lang/XMLParser$EndTagContext.class
new file mode 100644
index 0000000..8b616b8
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLParser$EndTagContext.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLParser$StartTagContext.class b/target/classes/controlP5/layout/lang/XMLParser$StartTagContext.class
new file mode 100644
index 0000000..230f123
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLParser$StartTagContext.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLParser$ValueContext.class b/target/classes/controlP5/layout/lang/XMLParser$ValueContext.class
new file mode 100644
index 0000000..567a80f
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLParser$ValueContext.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLParser.class b/target/classes/controlP5/layout/lang/XMLParser.class
new file mode 100644
index 0000000..46452ad
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLParser.class differ
diff --git a/target/classes/controlP5/layout/lang/XMLVisitor.class b/target/classes/controlP5/layout/lang/XMLVisitor.class
new file mode 100644
index 0000000..4ceb02f
Binary files /dev/null and b/target/classes/controlP5/layout/lang/XMLVisitor.class differ
diff --git a/target/classes/main/java/sketch/Sketch.class b/target/classes/main/java/sketch/Sketch.class
deleted file mode 100644
index 9ebfb53..0000000
Binary files a/target/classes/main/java/sketch/Sketch.class and /dev/null differ
diff --git a/target/classes/sketch/Sketch.class b/target/classes/sketch/Sketch.class
index 1966ce9..7e996b7 100644
Binary files a/target/classes/sketch/Sketch.class and b/target/classes/sketch/Sketch.class differ
diff --git a/target/surefire-reports/PACKAGE_NAME.LayoutTests.txt b/target/surefire-reports/PACKAGE_NAME.LayoutTests.txt
new file mode 100644
index 0000000..6cd9abe
--- /dev/null
+++ b/target/surefire-reports/PACKAGE_NAME.LayoutTests.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: PACKAGE_NAME.LayoutTests
+-------------------------------------------------------------------------------
+Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 s -- in PACKAGE_NAME.LayoutTests
diff --git a/target/surefire-reports/TEST-PACKAGE_NAME.LayoutTests.xml b/target/surefire-reports/TEST-PACKAGE_NAME.LayoutTests.xml
new file mode 100644
index 0000000..74939d2
--- /dev/null
+++ b/target/surefire-reports/TEST-PACKAGE_NAME.LayoutTests.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="PACKAGE_NAME.LayoutTests" time="0.008" tests="0" errors="0" skipped="0" failures="0">
+  <properties>
+    <property name="java.specification.version" value="20"/>
+    <property name="sun.jnu.encoding" value="UTF-8"/>
+    <property name="java.class.path" value="/Users/gabrielsalvador/Code/controlp5/target/test-classes:/Users/gabrielsalvador/Code/controlp5/target/classes:/Users/gabrielsalvador/.m2/repository/com/github/micycle1/processing-core-4/4.2/processing-core-4-4.2.jar:/Users/gabrielsalvador/.m2/repository/org/openjfx/javafx-controls/19.0.2.1/javafx-controls-19.0.2.1.jar:/Users/gabrielsalvador/.m2/repository/org/openjfx/javafx-controls/19.0.2.1/javafx-controls-19.0.2.1-mac-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/openjfx/javafx-graphics/19.0.2.1/javafx-graphics-19.0.2.1.jar:/Users/gabrielsalvador/.m2/repository/org/openjfx/javafx-graphics/19.0.2.1/javafx-graphics-19.0.2.1-mac-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/openjfx/javafx-base/19.0.2.1/javafx-base-19.0.2.1.jar:/Users/gabrielsalvador/.m2/repository/org/openjfx/javafx-base/19.0.2.1/javafx-base-19.0.2.1-mac-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all-main/2.4.0/jogl-all-main-2.4.0.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0-natives-android-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0-natives-linux-amd64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0-natives-linux-armv6hf.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0-natives-linux-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0-natives-macosx-universal.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0-natives-windows-amd64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt-main/2.4.0/gluegen-rt-main-2.4.0.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0-natives-android-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0-natives-linux-amd64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0-natives-linux-armv6hf.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0-natives-linux-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0-natives-macosx-universal.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0-natives-windows-amd64.jar:/Users/gabrielsalvador/.m2/repository/antlr/antlr/2.7.7/antlr-2.7.7.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-svggen/1.16/batik-svggen-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-awt-util/1.16/batik-awt-util-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/xmlgraphics-commons/2.7/xmlgraphics-commons-2.7.jar:/Users/gabrielsalvador/.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar:/Users/gabrielsalvador/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-shared-resources/1.16/batik-shared-resources-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-util/1.16/batik-util-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-constants/1.16/batik-constants-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-i18n/1.16/batik-i18n-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-dom/1.16/batik-dom-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-css/1.16/batik-css-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-ext/1.16/batik-ext-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-xml/1.16/batik-xml-1.16.jar:/Users/gabrielsalvador/.m2/repository/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar:/Users/gabrielsalvador/.m2/repository/com/lowagie/itext/2.1.7/itext-2.1.7.jar:/Users/gabrielsalvador/.m2/repository/bouncycastle/bcmail-jdk14/138/bcmail-jdk14-138.jar:/Users/gabrielsalvador/.m2/repository/bouncycastle/bcprov-jdk14/138/bcprov-jdk14-138.jar:/Users/gabrielsalvador/.m2/repository/org/bouncycastle/bctsp-jdk14/1.38/bctsp-jdk14-1.38.jar:/Users/gabrielsalvador/.m2/repository/org/bouncycastle/bcprov-jdk14/1.38/bcprov-jdk14-1.38.jar:/Users/gabrielsalvador/.m2/repository/org/bouncycastle/bcmail-jdk14/1.38/bcmail-jdk14-1.38.jar:/Users/gabrielsalvador/.m2/repository/org/antlr/antlr4-runtime/4.12.0/antlr4-runtime-4.12.0.jar:"/>
+    <property name="java.vm.vendor" value="Homebrew"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="java.vendor.url" value="https://github.com/Homebrew/homebrew-core/issues"/>
+    <property name="os.name" value="Mac OS X"/>
+    <property name="java.vm.specification.version" value="20"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="user.country" value="PT"/>
+    <property name="sun.boot.library.path" value="/opt/homebrew/Cellar/openjdk/20.0.1/libexec/openjdk.jdk/Contents/Home/lib"/>
+    <property name="sun.java.command" value="/Users/gabrielsalvador/Code/controlp5/target/surefire/surefirebooter-20230709145826062_3.jar /Users/gabrielsalvador/Code/controlp5/target/surefire 2023-07-09T14-58-26_023-jvmRun1 surefire-20230709145826062_1tmp surefire_0-20230709145826062_2tmp"/>
+    <property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="jdk.debug" value="release"/>
+    <property name="surefire.test.class.path" value="/Users/gabrielsalvador/Code/controlp5/target/test-classes:/Users/gabrielsalvador/Code/controlp5/target/classes:/Users/gabrielsalvador/.m2/repository/com/github/micycle1/processing-core-4/4.2/processing-core-4-4.2.jar:/Users/gabrielsalvador/.m2/repository/org/openjfx/javafx-controls/19.0.2.1/javafx-controls-19.0.2.1.jar:/Users/gabrielsalvador/.m2/repository/org/openjfx/javafx-controls/19.0.2.1/javafx-controls-19.0.2.1-mac-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/openjfx/javafx-graphics/19.0.2.1/javafx-graphics-19.0.2.1.jar:/Users/gabrielsalvador/.m2/repository/org/openjfx/javafx-graphics/19.0.2.1/javafx-graphics-19.0.2.1-mac-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/openjfx/javafx-base/19.0.2.1/javafx-base-19.0.2.1.jar:/Users/gabrielsalvador/.m2/repository/org/openjfx/javafx-base/19.0.2.1/javafx-base-19.0.2.1-mac-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all-main/2.4.0/jogl-all-main-2.4.0.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0-natives-android-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0-natives-linux-amd64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0-natives-linux-armv6hf.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0-natives-linux-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0-natives-macosx-universal.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/jogl/jogl-all/2.4.0/jogl-all-2.4.0-natives-windows-amd64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt-main/2.4.0/gluegen-rt-main-2.4.0.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0-natives-android-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0-natives-linux-amd64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0-natives-linux-armv6hf.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0-natives-linux-aarch64.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0-natives-macosx-universal.jar:/Users/gabrielsalvador/.m2/repository/org/jogamp/gluegen/gluegen-rt/2.4.0/gluegen-rt-2.4.0-natives-windows-amd64.jar:/Users/gabrielsalvador/.m2/repository/antlr/antlr/2.7.7/antlr-2.7.7.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-svggen/1.16/batik-svggen-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-awt-util/1.16/batik-awt-util-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/xmlgraphics-commons/2.7/xmlgraphics-commons-2.7.jar:/Users/gabrielsalvador/.m2/repository/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar:/Users/gabrielsalvador/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-shared-resources/1.16/batik-shared-resources-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-util/1.16/batik-util-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-constants/1.16/batik-constants-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-i18n/1.16/batik-i18n-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-dom/1.16/batik-dom-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-css/1.16/batik-css-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-ext/1.16/batik-ext-1.16.jar:/Users/gabrielsalvador/.m2/repository/org/apache/xmlgraphics/batik-xml/1.16/batik-xml-1.16.jar:/Users/gabrielsalvador/.m2/repository/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar:/Users/gabrielsalvador/.m2/repository/com/lowagie/itext/2.1.7/itext-2.1.7.jar:/Users/gabrielsalvador/.m2/repository/bouncycastle/bcmail-jdk14/138/bcmail-jdk14-138.jar:/Users/gabrielsalvador/.m2/repository/bouncycastle/bcprov-jdk14/138/bcprov-jdk14-138.jar:/Users/gabrielsalvador/.m2/repository/org/bouncycastle/bctsp-jdk14/1.38/bctsp-jdk14-1.38.jar:/Users/gabrielsalvador/.m2/repository/org/bouncycastle/bcprov-jdk14/1.38/bcprov-jdk14-1.38.jar:/Users/gabrielsalvador/.m2/repository/org/bouncycastle/bcmail-jdk14/1.38/bcmail-jdk14-1.38.jar:/Users/gabrielsalvador/.m2/repository/org/antlr/antlr4-runtime/4.12.0/antlr4-runtime-4.12.0.jar:"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="user.home" value="/Users/gabrielsalvador"/>
+    <property name="user.language" value="en"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.version.date" value="2023-04-18"/>
+    <property name="java.home" value="/opt/homebrew/Cellar/openjdk/20.0.1/libexec/openjdk.jdk/Contents/Home"/>
+    <property name="file.separator" value="/"/>
+    <property name="basedir" value="/Users/gabrielsalvador/Code/controlp5"/>
+    <property name="java.vm.compressedOopsMode" value="Zero based"/>
+    <property name="line.separator" value="&#10;"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="apple.awt.application.name" value="ForkedBooter"/>
+    <property name="surefire.real.class.path" value="/Users/gabrielsalvador/Code/controlp5/target/surefire/surefirebooter-20230709145826062_3.jar"/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="java.runtime.version" value="20.0.1"/>
+    <property name="user.name" value="gabrielsalvador"/>
+    <property name="stdout.encoding" value="UTF-8"/>
+    <property name="path.separator" value=":"/>
+    <property name="os.version" value="13.2.1"/>
+    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
+    <property name="java.vendor.version" value="Homebrew"/>
+    <property name="localRepository" value="/Users/gabrielsalvador/.m2/repository"/>
+    <property name="java.vendor.url.bug" value="https://github.com/Homebrew/homebrew-core/issues"/>
+    <property name="java.io.tmpdir" value="/var/folders/3w/rr68zpn96d91kcqspbq3r2f00000gn/T/"/>
+    <property name="java.version" value="20.0.1"/>
+    <property name="user.dir" value="/Users/gabrielsalvador/Code/controlp5"/>
+    <property name="os.arch" value="aarch64"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="native.encoding" value="UTF-8"/>
+    <property name="java.library.path" value="/Users/gabrielsalvador/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:."/>
+    <property name="java.vm.info" value="mixed mode, sharing"/>
+    <property name="stderr.encoding" value="UTF-8"/>
+    <property name="java.vendor" value="Homebrew"/>
+    <property name="java.vm.version" value="20.0.1"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeBig"/>
+    <property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="java.class.version" value="64.0"/>
+  </properties>
+</testsuite>
\ No newline at end of file