package refactor

src/main/java/controlP5/Accordion.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Background.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Bang.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/BitFont.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Button.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ButtonBar.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 
 /**

src/main/java/controlP5/CColor.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/CDrawable.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/CP.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/CallbackEvent.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/CallbackListener.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Canvas.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Chart.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ChartData.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ChartDataSet.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/CheckBox.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ColorPalette.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ColorPicker.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ColorWheel.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlBehavior.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlBroadcaster.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlElement.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlEvent.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlFont.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlGroup.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlKey.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlListener.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

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>

src/main/java/controlP5/ControlP5Base.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlP5Constants.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlP5Legacy.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlTimer.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlWindow.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControlWindowCanvas.java

@@ -1,5 +1,5 @@
 
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Controller.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControllerAutomator.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControllerDisplay.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControllerGroup.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControllerInterface.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControllerLayout.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControllerLayoutElement.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControllerList.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControllerPlug.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControllerProperties.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControllerProperty.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControllerStyle.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ControllerView.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/DropdownList.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 import static main.java.controlp5.ControlP5.b;
 

src/main/java/controlP5/FieldChangedListener.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/FrameRate.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Group.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Icon.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Knob.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Label.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ListBox.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Matrix.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/MultiList.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/MultiListButton.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/MultiListInterface.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/MultilineTextfield.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 import processing.event.KeyEvent;
 

src/main/java/controlP5/Numberbox.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Pad.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Pointer.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Println.java

@@ -1,5 +1,5 @@
 
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Radio.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/RadioButton.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Range.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/ScrollableList.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Slider.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Slider2D.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Spacer.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Tab.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Textarea.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Textfield.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/TextfieldCommand.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 public interface TextfieldCommand {
     void execute( );

src/main/java/controlP5/Textlabel.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/TickMark.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Toggle.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

src/main/java/controlP5/Tooltip.java

@@ -1,4 +1,4 @@
-package main.java.controlp5;
+package controlP5;
 
 /**
  * controlP5 is a processing gui library.

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( ) ;

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;

src/main/java/controlP5/layout/LayoutBuilder.java

@@ -1,4 +1,4 @@
-package main.java.controlp5.layout;
+package controlP5.layout;
 
 
 import main.java.controlp5.ControlP5;

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;

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;
 
 /**

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;

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;
 
 /**

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.*;

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;
 
 /**

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 controlP5.Button;
-import main.java.controlp5.MultilineTextfield;
+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;