diff --git a/.classpath b/.classpath
new file mode 100644
index 00000000..35bca5ea
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..b83d2226
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/.project b/.project
new file mode 100644
index 00000000..5b548850
--- /dev/null
+++ b/.project
@@ -0,0 +1,23 @@
+
+
+ opensourcephysics
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ org.eclipse.m2e.core.maven2Nature
+
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..71799553
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,10 @@
+
+ 4.0.0
+ com.github.buffetboy2001
+ osp
+ 1.0.0-buffetboy2001-SNAPSHOT
+
+
+ www.opensourcephysics.org
+ buffetboy2001's fork of OSP. Visit opensourcephysics.org for details of the code.
+
\ No newline at end of file
diff --git a/src/org/jibble/epsgraphics/EpsDocument.java b/src/main/java/org/jibble/epsgraphics/EpsDocument.java
similarity index 100%
rename from src/org/jibble/epsgraphics/EpsDocument.java
rename to src/main/java/org/jibble/epsgraphics/EpsDocument.java
diff --git a/src/org/jibble/epsgraphics/EpsException.java b/src/main/java/org/jibble/epsgraphics/EpsException.java
similarity index 100%
rename from src/org/jibble/epsgraphics/EpsException.java
rename to src/main/java/org/jibble/epsgraphics/EpsException.java
diff --git a/src/org/jibble/epsgraphics/EpsGraphics2D.java b/src/main/java/org/jibble/epsgraphics/EpsGraphics2D.java
similarity index 100%
rename from src/org/jibble/epsgraphics/EpsGraphics2D.java
rename to src/main/java/org/jibble/epsgraphics/EpsGraphics2D.java
diff --git a/src/org/opensourcephysics/analysis/FourierAnalysis.java b/src/main/java/org/opensourcephysics/analysis/FourierAnalysis.java
similarity index 100%
rename from src/org/opensourcephysics/analysis/FourierAnalysis.java
rename to src/main/java/org/opensourcephysics/analysis/FourierAnalysis.java
diff --git a/src/org/opensourcephysics/analysis/FourierSinCosAnalysis.java b/src/main/java/org/opensourcephysics/analysis/FourierSinCosAnalysis.java
similarity index 100%
rename from src/org/opensourcephysics/analysis/FourierSinCosAnalysis.java
rename to src/main/java/org/opensourcephysics/analysis/FourierSinCosAnalysis.java
diff --git a/src/org/opensourcephysics/controls/AbstractAnimation.java b/src/main/java/org/opensourcephysics/controls/AbstractAnimation.java
similarity index 100%
rename from src/org/opensourcephysics/controls/AbstractAnimation.java
rename to src/main/java/org/opensourcephysics/controls/AbstractAnimation.java
diff --git a/src/org/opensourcephysics/controls/AbstractCalculation.java b/src/main/java/org/opensourcephysics/controls/AbstractCalculation.java
similarity index 100%
rename from src/org/opensourcephysics/controls/AbstractCalculation.java
rename to src/main/java/org/opensourcephysics/controls/AbstractCalculation.java
diff --git a/src/org/opensourcephysics/controls/AbstractSimulation.java b/src/main/java/org/opensourcephysics/controls/AbstractSimulation.java
similarity index 100%
rename from src/org/opensourcephysics/controls/AbstractSimulation.java
rename to src/main/java/org/opensourcephysics/controls/AbstractSimulation.java
diff --git a/src/org/opensourcephysics/controls/Animation.java b/src/main/java/org/opensourcephysics/controls/Animation.java
similarity index 100%
rename from src/org/opensourcephysics/controls/Animation.java
rename to src/main/java/org/opensourcephysics/controls/Animation.java
diff --git a/src/org/opensourcephysics/controls/AnimationControl.java b/src/main/java/org/opensourcephysics/controls/AnimationControl.java
similarity index 100%
rename from src/org/opensourcephysics/controls/AnimationControl.java
rename to src/main/java/org/opensourcephysics/controls/AnimationControl.java
diff --git a/src/org/opensourcephysics/controls/Base64Coder.java b/src/main/java/org/opensourcephysics/controls/Base64Coder.java
similarity index 100%
rename from src/org/opensourcephysics/controls/Base64Coder.java
rename to src/main/java/org/opensourcephysics/controls/Base64Coder.java
diff --git a/src/org/opensourcephysics/controls/Calculation.java b/src/main/java/org/opensourcephysics/controls/Calculation.java
similarity index 100%
rename from src/org/opensourcephysics/controls/Calculation.java
rename to src/main/java/org/opensourcephysics/controls/Calculation.java
diff --git a/src/org/opensourcephysics/controls/CalculationControl.java b/src/main/java/org/opensourcephysics/controls/CalculationControl.java
similarity index 100%
rename from src/org/opensourcephysics/controls/CalculationControl.java
rename to src/main/java/org/opensourcephysics/controls/CalculationControl.java
diff --git a/src/org/opensourcephysics/controls/ConsoleLevel.java b/src/main/java/org/opensourcephysics/controls/ConsoleLevel.java
similarity index 100%
rename from src/org/opensourcephysics/controls/ConsoleLevel.java
rename to src/main/java/org/opensourcephysics/controls/ConsoleLevel.java
diff --git a/src/org/opensourcephysics/controls/Control.java b/src/main/java/org/opensourcephysics/controls/Control.java
similarity index 100%
rename from src/org/opensourcephysics/controls/Control.java
rename to src/main/java/org/opensourcephysics/controls/Control.java
diff --git a/src/org/opensourcephysics/controls/ControlFrame.java b/src/main/java/org/opensourcephysics/controls/ControlFrame.java
similarity index 100%
rename from src/org/opensourcephysics/controls/ControlFrame.java
rename to src/main/java/org/opensourcephysics/controls/ControlFrame.java
diff --git a/src/org/opensourcephysics/controls/ControlUtils.java b/src/main/java/org/opensourcephysics/controls/ControlUtils.java
similarity index 100%
rename from src/org/opensourcephysics/controls/ControlUtils.java
rename to src/main/java/org/opensourcephysics/controls/ControlUtils.java
diff --git a/src/org/opensourcephysics/controls/ControlsRes.java b/src/main/java/org/opensourcephysics/controls/ControlsRes.java
similarity index 100%
rename from src/org/opensourcephysics/controls/ControlsRes.java
rename to src/main/java/org/opensourcephysics/controls/ControlsRes.java
diff --git a/src/org/opensourcephysics/controls/Cryptic.java b/src/main/java/org/opensourcephysics/controls/Cryptic.java
similarity index 100%
rename from src/org/opensourcephysics/controls/Cryptic.java
rename to src/main/java/org/opensourcephysics/controls/Cryptic.java
diff --git a/src/org/opensourcephysics/controls/HiddenControl.java b/src/main/java/org/opensourcephysics/controls/HiddenControl.java
similarity index 100%
rename from src/org/opensourcephysics/controls/HiddenControl.java
rename to src/main/java/org/opensourcephysics/controls/HiddenControl.java
diff --git a/src/org/opensourcephysics/controls/ListChooser.java b/src/main/java/org/opensourcephysics/controls/ListChooser.java
similarity index 100%
rename from src/org/opensourcephysics/controls/ListChooser.java
rename to src/main/java/org/opensourcephysics/controls/ListChooser.java
diff --git a/src/org/opensourcephysics/controls/MainFrame.java b/src/main/java/org/opensourcephysics/controls/MainFrame.java
similarity index 100%
rename from src/org/opensourcephysics/controls/MainFrame.java
rename to src/main/java/org/opensourcephysics/controls/MainFrame.java
diff --git a/src/org/opensourcephysics/controls/MessageFrame.java b/src/main/java/org/opensourcephysics/controls/MessageFrame.java
similarity index 100%
rename from src/org/opensourcephysics/controls/MessageFrame.java
rename to src/main/java/org/opensourcephysics/controls/MessageFrame.java
diff --git a/src/org/opensourcephysics/controls/OSPApplication.java b/src/main/java/org/opensourcephysics/controls/OSPApplication.java
similarity index 100%
rename from src/org/opensourcephysics/controls/OSPApplication.java
rename to src/main/java/org/opensourcephysics/controls/OSPApplication.java
diff --git a/src/org/opensourcephysics/controls/OSPCombo.java b/src/main/java/org/opensourcephysics/controls/OSPCombo.java
similarity index 100%
rename from src/org/opensourcephysics/controls/OSPCombo.java
rename to src/main/java/org/opensourcephysics/controls/OSPCombo.java
diff --git a/src/org/opensourcephysics/controls/OSPControl.java b/src/main/java/org/opensourcephysics/controls/OSPControl.java
similarity index 100%
rename from src/org/opensourcephysics/controls/OSPControl.java
rename to src/main/java/org/opensourcephysics/controls/OSPControl.java
diff --git a/src/org/opensourcephysics/controls/OSPControlTable.java b/src/main/java/org/opensourcephysics/controls/OSPControlTable.java
similarity index 100%
rename from src/org/opensourcephysics/controls/OSPControlTable.java
rename to src/main/java/org/opensourcephysics/controls/OSPControlTable.java
diff --git a/src/org/opensourcephysics/controls/OSPInspector.java b/src/main/java/org/opensourcephysics/controls/OSPInspector.java
similarity index 100%
rename from src/org/opensourcephysics/controls/OSPInspector.java
rename to src/main/java/org/opensourcephysics/controls/OSPInspector.java
diff --git a/src/org/opensourcephysics/controls/OSPLog.java b/src/main/java/org/opensourcephysics/controls/OSPLog.java
similarity index 100%
rename from src/org/opensourcephysics/controls/OSPLog.java
rename to src/main/java/org/opensourcephysics/controls/OSPLog.java
diff --git a/src/org/opensourcephysics/controls/OSPTableInspector.java b/src/main/java/org/opensourcephysics/controls/OSPTableInspector.java
similarity index 100%
rename from src/org/opensourcephysics/controls/OSPTableInspector.java
rename to src/main/java/org/opensourcephysics/controls/OSPTableInspector.java
diff --git a/src/org/opensourcephysics/controls/ParsableTextArea.java b/src/main/java/org/opensourcephysics/controls/ParsableTextArea.java
similarity index 100%
rename from src/org/opensourcephysics/controls/ParsableTextArea.java
rename to src/main/java/org/opensourcephysics/controls/ParsableTextArea.java
diff --git a/src/org/opensourcephysics/controls/Password.java b/src/main/java/org/opensourcephysics/controls/Password.java
similarity index 100%
rename from src/org/opensourcephysics/controls/Password.java
rename to src/main/java/org/opensourcephysics/controls/Password.java
diff --git a/src/org/opensourcephysics/controls/SimControl.java b/src/main/java/org/opensourcephysics/controls/SimControl.java
similarity index 100%
rename from src/org/opensourcephysics/controls/SimControl.java
rename to src/main/java/org/opensourcephysics/controls/SimControl.java
diff --git a/src/org/opensourcephysics/controls/Simulation.java b/src/main/java/org/opensourcephysics/controls/Simulation.java
similarity index 100%
rename from src/org/opensourcephysics/controls/Simulation.java
rename to src/main/java/org/opensourcephysics/controls/Simulation.java
diff --git a/src/org/opensourcephysics/controls/SimulationControl.java b/src/main/java/org/opensourcephysics/controls/SimulationControl.java
similarity index 100%
rename from src/org/opensourcephysics/controls/SimulationControl.java
rename to src/main/java/org/opensourcephysics/controls/SimulationControl.java
diff --git a/src/org/opensourcephysics/controls/VariableNotFoundException.java b/src/main/java/org/opensourcephysics/controls/VariableNotFoundException.java
similarity index 100%
rename from src/org/opensourcephysics/controls/VariableNotFoundException.java
rename to src/main/java/org/opensourcephysics/controls/VariableNotFoundException.java
diff --git a/src/org/opensourcephysics/controls/XML.java b/src/main/java/org/opensourcephysics/controls/XML.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XML.java
rename to src/main/java/org/opensourcephysics/controls/XML.java
diff --git a/src/org/opensourcephysics/controls/XMLControl.java b/src/main/java/org/opensourcephysics/controls/XMLControl.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLControl.java
rename to src/main/java/org/opensourcephysics/controls/XMLControl.java
diff --git a/src/org/opensourcephysics/controls/XMLControlElement.java b/src/main/java/org/opensourcephysics/controls/XMLControlElement.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLControlElement.java
rename to src/main/java/org/opensourcephysics/controls/XMLControlElement.java
diff --git a/src/org/opensourcephysics/controls/XMLJavaLoader.java b/src/main/java/org/opensourcephysics/controls/XMLJavaLoader.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLJavaLoader.java
rename to src/main/java/org/opensourcephysics/controls/XMLJavaLoader.java
diff --git a/src/org/opensourcephysics/controls/XMLLoader.java b/src/main/java/org/opensourcephysics/controls/XMLLoader.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLLoader.java
rename to src/main/java/org/opensourcephysics/controls/XMLLoader.java
diff --git a/src/org/opensourcephysics/controls/XMLProperty.java b/src/main/java/org/opensourcephysics/controls/XMLProperty.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLProperty.java
rename to src/main/java/org/opensourcephysics/controls/XMLProperty.java
diff --git a/src/org/opensourcephysics/controls/XMLPropertyElement.java b/src/main/java/org/opensourcephysics/controls/XMLPropertyElement.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLPropertyElement.java
rename to src/main/java/org/opensourcephysics/controls/XMLPropertyElement.java
diff --git a/src/org/opensourcephysics/controls/XMLTable.java b/src/main/java/org/opensourcephysics/controls/XMLTable.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLTable.java
rename to src/main/java/org/opensourcephysics/controls/XMLTable.java
diff --git a/src/org/opensourcephysics/controls/XMLTableInspector.java b/src/main/java/org/opensourcephysics/controls/XMLTableInspector.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLTableInspector.java
rename to src/main/java/org/opensourcephysics/controls/XMLTableInspector.java
diff --git a/src/org/opensourcephysics/controls/XMLTableModel.java b/src/main/java/org/opensourcephysics/controls/XMLTableModel.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLTableModel.java
rename to src/main/java/org/opensourcephysics/controls/XMLTableModel.java
diff --git a/src/org/opensourcephysics/controls/XMLTree.java b/src/main/java/org/opensourcephysics/controls/XMLTree.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLTree.java
rename to src/main/java/org/opensourcephysics/controls/XMLTree.java
diff --git a/src/org/opensourcephysics/controls/XMLTreeChooser.java b/src/main/java/org/opensourcephysics/controls/XMLTreeChooser.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLTreeChooser.java
rename to src/main/java/org/opensourcephysics/controls/XMLTreeChooser.java
diff --git a/src/org/opensourcephysics/controls/XMLTreeNode.java b/src/main/java/org/opensourcephysics/controls/XMLTreeNode.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLTreeNode.java
rename to src/main/java/org/opensourcephysics/controls/XMLTreeNode.java
diff --git a/src/org/opensourcephysics/controls/XMLTreePanel.java b/src/main/java/org/opensourcephysics/controls/XMLTreePanel.java
similarity index 100%
rename from src/org/opensourcephysics/controls/XMLTreePanel.java
rename to src/main/java/org/opensourcephysics/controls/XMLTreePanel.java
diff --git a/src/org/opensourcephysics/davidson/applets/ApplicationApplet.java b/src/main/java/org/opensourcephysics/davidson/applets/ApplicationApplet.java
similarity index 100%
rename from src/org/opensourcephysics/davidson/applets/ApplicationApplet.java
rename to src/main/java/org/opensourcephysics/davidson/applets/ApplicationApplet.java
diff --git a/src/org/opensourcephysics/davidson/applets/FrameApplet.java b/src/main/java/org/opensourcephysics/davidson/applets/FrameApplet.java
similarity index 100%
rename from src/org/opensourcephysics/davidson/applets/FrameApplet.java
rename to src/main/java/org/opensourcephysics/davidson/applets/FrameApplet.java
diff --git a/src/org/opensourcephysics/desktop/OSPDesktop.java b/src/main/java/org/opensourcephysics/desktop/OSPDesktop.java
similarity index 100%
rename from src/org/opensourcephysics/desktop/OSPDesktop.java
rename to src/main/java/org/opensourcephysics/desktop/OSPDesktop.java
diff --git a/src/org/opensourcephysics/desktop/ostermiller/Browser.java b/src/main/java/org/opensourcephysics/desktop/ostermiller/Browser.java
similarity index 100%
rename from src/org/opensourcephysics/desktop/ostermiller/Browser.java
rename to src/main/java/org/opensourcephysics/desktop/ostermiller/Browser.java
diff --git a/src/org/opensourcephysics/desktop/ostermiller/BrowserCommandLexer.java b/src/main/java/org/opensourcephysics/desktop/ostermiller/BrowserCommandLexer.java
similarity index 100%
rename from src/org/opensourcephysics/desktop/ostermiller/BrowserCommandLexer.java
rename to src/main/java/org/opensourcephysics/desktop/ostermiller/BrowserCommandLexer.java
diff --git a/src/org/opensourcephysics/display/AbstractInteractive.java b/src/main/java/org/opensourcephysics/display/AbstractInteractive.java
similarity index 100%
rename from src/org/opensourcephysics/display/AbstractInteractive.java
rename to src/main/java/org/opensourcephysics/display/AbstractInteractive.java
diff --git a/src/org/opensourcephysics/display/AbstractMouseHandler.java b/src/main/java/org/opensourcephysics/display/AbstractMouseHandler.java
similarity index 100%
rename from src/org/opensourcephysics/display/AbstractMouseHandler.java
rename to src/main/java/org/opensourcephysics/display/AbstractMouseHandler.java
diff --git a/src/org/opensourcephysics/display/AbstractTrail.java b/src/main/java/org/opensourcephysics/display/AbstractTrail.java
similarity index 100%
rename from src/org/opensourcephysics/display/AbstractTrail.java
rename to src/main/java/org/opensourcephysics/display/AbstractTrail.java
diff --git a/src/org/opensourcephysics/display/AppFrame.java b/src/main/java/org/opensourcephysics/display/AppFrame.java
similarity index 100%
rename from src/org/opensourcephysics/display/AppFrame.java
rename to src/main/java/org/opensourcephysics/display/AppFrame.java
diff --git a/src/org/opensourcephysics/display/ArrayPanel.java b/src/main/java/org/opensourcephysics/display/ArrayPanel.java
similarity index 100%
rename from src/org/opensourcephysics/display/ArrayPanel.java
rename to src/main/java/org/opensourcephysics/display/ArrayPanel.java
diff --git a/src/org/opensourcephysics/display/ArrayTable.java b/src/main/java/org/opensourcephysics/display/ArrayTable.java
similarity index 100%
rename from src/org/opensourcephysics/display/ArrayTable.java
rename to src/main/java/org/opensourcephysics/display/ArrayTable.java
diff --git a/src/org/opensourcephysics/display/ArrayTableModel.java b/src/main/java/org/opensourcephysics/display/ArrayTableModel.java
similarity index 100%
rename from src/org/opensourcephysics/display/ArrayTableModel.java
rename to src/main/java/org/opensourcephysics/display/ArrayTableModel.java
diff --git a/src/org/opensourcephysics/display/Arrow.java b/src/main/java/org/opensourcephysics/display/Arrow.java
similarity index 100%
rename from src/org/opensourcephysics/display/Arrow.java
rename to src/main/java/org/opensourcephysics/display/Arrow.java
diff --git a/src/org/opensourcephysics/display/ArrowLoader.java b/src/main/java/org/opensourcephysics/display/ArrowLoader.java
similarity index 100%
rename from src/org/opensourcephysics/display/ArrowLoader.java
rename to src/main/java/org/opensourcephysics/display/ArrowLoader.java
diff --git a/src/org/opensourcephysics/display/BoundedImage.java b/src/main/java/org/opensourcephysics/display/BoundedImage.java
similarity index 100%
rename from src/org/opensourcephysics/display/BoundedImage.java
rename to src/main/java/org/opensourcephysics/display/BoundedImage.java
diff --git a/src/org/opensourcephysics/display/BoundedShape.java b/src/main/java/org/opensourcephysics/display/BoundedShape.java
similarity index 100%
rename from src/org/opensourcephysics/display/BoundedShape.java
rename to src/main/java/org/opensourcephysics/display/BoundedShape.java
diff --git a/src/org/opensourcephysics/display/BoundedTextLine.java b/src/main/java/org/opensourcephysics/display/BoundedTextLine.java
similarity index 100%
rename from src/org/opensourcephysics/display/BoundedTextLine.java
rename to src/main/java/org/opensourcephysics/display/BoundedTextLine.java
diff --git a/src/org/opensourcephysics/display/ByteImage.java b/src/main/java/org/opensourcephysics/display/ByteImage.java
similarity index 100%
rename from src/org/opensourcephysics/display/ByteImage.java
rename to src/main/java/org/opensourcephysics/display/ByteImage.java
diff --git a/src/org/opensourcephysics/display/CellBorder.java b/src/main/java/org/opensourcephysics/display/CellBorder.java
similarity index 100%
rename from src/org/opensourcephysics/display/CellBorder.java
rename to src/main/java/org/opensourcephysics/display/CellBorder.java
diff --git a/src/org/opensourcephysics/display/Circle.java b/src/main/java/org/opensourcephysics/display/Circle.java
similarity index 100%
rename from src/org/opensourcephysics/display/Circle.java
rename to src/main/java/org/opensourcephysics/display/Circle.java
diff --git a/src/org/opensourcephysics/display/CircleLoader.java b/src/main/java/org/opensourcephysics/display/CircleLoader.java
similarity index 100%
rename from src/org/opensourcephysics/display/CircleLoader.java
rename to src/main/java/org/opensourcephysics/display/CircleLoader.java
diff --git a/src/org/opensourcephysics/display/ColorIcon.java b/src/main/java/org/opensourcephysics/display/ColorIcon.java
similarity index 100%
rename from src/org/opensourcephysics/display/ColorIcon.java
rename to src/main/java/org/opensourcephysics/display/ColorIcon.java
diff --git a/src/org/opensourcephysics/display/ComplexDataset.java b/src/main/java/org/opensourcephysics/display/ComplexDataset.java
similarity index 100%
rename from src/org/opensourcephysics/display/ComplexDataset.java
rename to src/main/java/org/opensourcephysics/display/ComplexDataset.java
diff --git a/src/org/opensourcephysics/display/Data.java b/src/main/java/org/opensourcephysics/display/Data.java
similarity index 100%
rename from src/org/opensourcephysics/display/Data.java
rename to src/main/java/org/opensourcephysics/display/Data.java
diff --git a/src/org/opensourcephysics/display/DataAdapter.java b/src/main/java/org/opensourcephysics/display/DataAdapter.java
similarity index 100%
rename from src/org/opensourcephysics/display/DataAdapter.java
rename to src/main/java/org/opensourcephysics/display/DataAdapter.java
diff --git a/src/org/opensourcephysics/display/DataFile.java b/src/main/java/org/opensourcephysics/display/DataFile.java
similarity index 100%
rename from src/org/opensourcephysics/display/DataFile.java
rename to src/main/java/org/opensourcephysics/display/DataFile.java
diff --git a/src/org/opensourcephysics/display/DataFunction.java b/src/main/java/org/opensourcephysics/display/DataFunction.java
similarity index 100%
rename from src/org/opensourcephysics/display/DataFunction.java
rename to src/main/java/org/opensourcephysics/display/DataFunction.java
diff --git a/src/org/opensourcephysics/display/DataPanel.java b/src/main/java/org/opensourcephysics/display/DataPanel.java
similarity index 100%
rename from src/org/opensourcephysics/display/DataPanel.java
rename to src/main/java/org/opensourcephysics/display/DataPanel.java
diff --git a/src/org/opensourcephysics/display/DataRowModel.java b/src/main/java/org/opensourcephysics/display/DataRowModel.java
similarity index 100%
rename from src/org/opensourcephysics/display/DataRowModel.java
rename to src/main/java/org/opensourcephysics/display/DataRowModel.java
diff --git a/src/org/opensourcephysics/display/DataRowTable.java b/src/main/java/org/opensourcephysics/display/DataRowTable.java
similarity index 100%
rename from src/org/opensourcephysics/display/DataRowTable.java
rename to src/main/java/org/opensourcephysics/display/DataRowTable.java
diff --git a/src/org/opensourcephysics/display/DataTable.java b/src/main/java/org/opensourcephysics/display/DataTable.java
similarity index 100%
rename from src/org/opensourcephysics/display/DataTable.java
rename to src/main/java/org/opensourcephysics/display/DataTable.java
diff --git a/src/org/opensourcephysics/display/DataTableFrame.java b/src/main/java/org/opensourcephysics/display/DataTableFrame.java
similarity index 100%
rename from src/org/opensourcephysics/display/DataTableFrame.java
rename to src/main/java/org/opensourcephysics/display/DataTableFrame.java
diff --git a/src/org/opensourcephysics/display/DataTableModel.java b/src/main/java/org/opensourcephysics/display/DataTableModel.java
similarity index 100%
rename from src/org/opensourcephysics/display/DataTableModel.java
rename to src/main/java/org/opensourcephysics/display/DataTableModel.java
diff --git a/src/org/opensourcephysics/display/Dataset.java b/src/main/java/org/opensourcephysics/display/Dataset.java
similarity index 100%
rename from src/org/opensourcephysics/display/Dataset.java
rename to src/main/java/org/opensourcephysics/display/Dataset.java
diff --git a/src/org/opensourcephysics/display/DatasetManager.java b/src/main/java/org/opensourcephysics/display/DatasetManager.java
similarity index 100%
rename from src/org/opensourcephysics/display/DatasetManager.java
rename to src/main/java/org/opensourcephysics/display/DatasetManager.java
diff --git a/src/org/opensourcephysics/display/Dimensioned.java b/src/main/java/org/opensourcephysics/display/Dimensioned.java
similarity index 100%
rename from src/org/opensourcephysics/display/Dimensioned.java
rename to src/main/java/org/opensourcephysics/display/Dimensioned.java
diff --git a/src/org/opensourcephysics/display/DisplayColors.java b/src/main/java/org/opensourcephysics/display/DisplayColors.java
similarity index 100%
rename from src/org/opensourcephysics/display/DisplayColors.java
rename to src/main/java/org/opensourcephysics/display/DisplayColors.java
diff --git a/src/org/opensourcephysics/display/DisplayRes.java b/src/main/java/org/opensourcephysics/display/DisplayRes.java
similarity index 100%
rename from src/org/opensourcephysics/display/DisplayRes.java
rename to src/main/java/org/opensourcephysics/display/DisplayRes.java
diff --git a/src/org/opensourcephysics/display/Drawable.java b/src/main/java/org/opensourcephysics/display/Drawable.java
similarity index 100%
rename from src/org/opensourcephysics/display/Drawable.java
rename to src/main/java/org/opensourcephysics/display/Drawable.java
diff --git a/src/org/opensourcephysics/display/DrawableBuffer.java b/src/main/java/org/opensourcephysics/display/DrawableBuffer.java
similarity index 100%
rename from src/org/opensourcephysics/display/DrawableBuffer.java
rename to src/main/java/org/opensourcephysics/display/DrawableBuffer.java
diff --git a/src/org/opensourcephysics/display/DrawableGroup.java b/src/main/java/org/opensourcephysics/display/DrawableGroup.java
similarity index 100%
rename from src/org/opensourcephysics/display/DrawableGroup.java
rename to src/main/java/org/opensourcephysics/display/DrawableGroup.java
diff --git a/src/org/opensourcephysics/display/DrawableShape.java b/src/main/java/org/opensourcephysics/display/DrawableShape.java
similarity index 100%
rename from src/org/opensourcephysics/display/DrawableShape.java
rename to src/main/java/org/opensourcephysics/display/DrawableShape.java
diff --git a/src/org/opensourcephysics/display/DrawableShapeLoader.java b/src/main/java/org/opensourcephysics/display/DrawableShapeLoader.java
similarity index 100%
rename from src/org/opensourcephysics/display/DrawableShapeLoader.java
rename to src/main/java/org/opensourcephysics/display/DrawableShapeLoader.java
diff --git a/src/org/opensourcephysics/display/DrawableTextLine.java b/src/main/java/org/opensourcephysics/display/DrawableTextLine.java
similarity index 100%
rename from src/org/opensourcephysics/display/DrawableTextLine.java
rename to src/main/java/org/opensourcephysics/display/DrawableTextLine.java
diff --git a/src/org/opensourcephysics/display/DrawingDialog.java b/src/main/java/org/opensourcephysics/display/DrawingDialog.java
similarity index 100%
rename from src/org/opensourcephysics/display/DrawingDialog.java
rename to src/main/java/org/opensourcephysics/display/DrawingDialog.java
diff --git a/src/org/opensourcephysics/display/DrawingFrame.java b/src/main/java/org/opensourcephysics/display/DrawingFrame.java
similarity index 100%
rename from src/org/opensourcephysics/display/DrawingFrame.java
rename to src/main/java/org/opensourcephysics/display/DrawingFrame.java
diff --git a/src/org/opensourcephysics/display/DrawingPanel.java b/src/main/java/org/opensourcephysics/display/DrawingPanel.java
similarity index 100%
rename from src/org/opensourcephysics/display/DrawingPanel.java
rename to src/main/java/org/opensourcephysics/display/DrawingPanel.java
diff --git a/src/org/opensourcephysics/display/False3D.java b/src/main/java/org/opensourcephysics/display/False3D.java
similarity index 100%
rename from src/org/opensourcephysics/display/False3D.java
rename to src/main/java/org/opensourcephysics/display/False3D.java
diff --git a/src/org/opensourcephysics/display/FunctionDrawer.java b/src/main/java/org/opensourcephysics/display/FunctionDrawer.java
similarity index 100%
rename from src/org/opensourcephysics/display/FunctionDrawer.java
rename to src/main/java/org/opensourcephysics/display/FunctionDrawer.java
diff --git a/src/org/opensourcephysics/display/GUIUtils.java b/src/main/java/org/opensourcephysics/display/GUIUtils.java
similarity index 100%
rename from src/org/opensourcephysics/display/GUIUtils.java
rename to src/main/java/org/opensourcephysics/display/GUIUtils.java
diff --git a/src/org/opensourcephysics/display/GeneralPathLoader.java b/src/main/java/org/opensourcephysics/display/GeneralPathLoader.java
similarity index 100%
rename from src/org/opensourcephysics/display/GeneralPathLoader.java
rename to src/main/java/org/opensourcephysics/display/GeneralPathLoader.java
diff --git a/src/org/opensourcephysics/display/GraphicsLib.java b/src/main/java/org/opensourcephysics/display/GraphicsLib.java
similarity index 100%
rename from src/org/opensourcephysics/display/GraphicsLib.java
rename to src/main/java/org/opensourcephysics/display/GraphicsLib.java
diff --git a/src/org/opensourcephysics/display/Grid.java b/src/main/java/org/opensourcephysics/display/Grid.java
similarity index 100%
rename from src/org/opensourcephysics/display/Grid.java
rename to src/main/java/org/opensourcephysics/display/Grid.java
diff --git a/src/org/opensourcephysics/display/Hidable.java b/src/main/java/org/opensourcephysics/display/Hidable.java
similarity index 100%
rename from src/org/opensourcephysics/display/Hidable.java
rename to src/main/java/org/opensourcephysics/display/Hidable.java
diff --git a/src/org/opensourcephysics/display/HighlightableDataset.java b/src/main/java/org/opensourcephysics/display/HighlightableDataset.java
similarity index 100%
rename from src/org/opensourcephysics/display/HighlightableDataset.java
rename to src/main/java/org/opensourcephysics/display/HighlightableDataset.java
diff --git a/src/org/opensourcephysics/display/Histogram.java b/src/main/java/org/opensourcephysics/display/Histogram.java
similarity index 100%
rename from src/org/opensourcephysics/display/Histogram.java
rename to src/main/java/org/opensourcephysics/display/Histogram.java
diff --git a/src/org/opensourcephysics/display/HistogramDataset.java b/src/main/java/org/opensourcephysics/display/HistogramDataset.java
similarity index 100%
rename from src/org/opensourcephysics/display/HistogramDataset.java
rename to src/main/java/org/opensourcephysics/display/HistogramDataset.java
diff --git a/src/org/opensourcephysics/display/IntegerImage.java b/src/main/java/org/opensourcephysics/display/IntegerImage.java
similarity index 100%
rename from src/org/opensourcephysics/display/IntegerImage.java
rename to src/main/java/org/opensourcephysics/display/IntegerImage.java
diff --git a/src/org/opensourcephysics/display/Interactive.java b/src/main/java/org/opensourcephysics/display/Interactive.java
similarity index 100%
rename from src/org/opensourcephysics/display/Interactive.java
rename to src/main/java/org/opensourcephysics/display/Interactive.java
diff --git a/src/org/opensourcephysics/display/InteractiveArrow.java b/src/main/java/org/opensourcephysics/display/InteractiveArrow.java
similarity index 100%
rename from src/org/opensourcephysics/display/InteractiveArrow.java
rename to src/main/java/org/opensourcephysics/display/InteractiveArrow.java
diff --git a/src/org/opensourcephysics/display/InteractiveCenteredArrow.java b/src/main/java/org/opensourcephysics/display/InteractiveCenteredArrow.java
similarity index 100%
rename from src/org/opensourcephysics/display/InteractiveCenteredArrow.java
rename to src/main/java/org/opensourcephysics/display/InteractiveCenteredArrow.java
diff --git a/src/org/opensourcephysics/display/InteractiveCircle.java b/src/main/java/org/opensourcephysics/display/InteractiveCircle.java
similarity index 100%
rename from src/org/opensourcephysics/display/InteractiveCircle.java
rename to src/main/java/org/opensourcephysics/display/InteractiveCircle.java
diff --git a/src/org/opensourcephysics/display/InteractiveImage.java b/src/main/java/org/opensourcephysics/display/InteractiveImage.java
similarity index 100%
rename from src/org/opensourcephysics/display/InteractiveImage.java
rename to src/main/java/org/opensourcephysics/display/InteractiveImage.java
diff --git a/src/org/opensourcephysics/display/InteractiveLabel.java b/src/main/java/org/opensourcephysics/display/InteractiveLabel.java
similarity index 100%
rename from src/org/opensourcephysics/display/InteractiveLabel.java
rename to src/main/java/org/opensourcephysics/display/InteractiveLabel.java
diff --git a/src/org/opensourcephysics/display/InteractiveMouseHandler.java b/src/main/java/org/opensourcephysics/display/InteractiveMouseHandler.java
similarity index 100%
rename from src/org/opensourcephysics/display/InteractiveMouseHandler.java
rename to src/main/java/org/opensourcephysics/display/InteractiveMouseHandler.java
diff --git a/src/org/opensourcephysics/display/InteractivePanel.java b/src/main/java/org/opensourcephysics/display/InteractivePanel.java
similarity index 100%
rename from src/org/opensourcephysics/display/InteractivePanel.java
rename to src/main/java/org/opensourcephysics/display/InteractivePanel.java
diff --git a/src/org/opensourcephysics/display/InteractiveShape.java b/src/main/java/org/opensourcephysics/display/InteractiveShape.java
similarity index 100%
rename from src/org/opensourcephysics/display/InteractiveShape.java
rename to src/main/java/org/opensourcephysics/display/InteractiveShape.java
diff --git a/src/org/opensourcephysics/display/InteractiveTextLine.java b/src/main/java/org/opensourcephysics/display/InteractiveTextLine.java
similarity index 100%
rename from src/org/opensourcephysics/display/InteractiveTextLine.java
rename to src/main/java/org/opensourcephysics/display/InteractiveTextLine.java
diff --git a/src/org/opensourcephysics/display/LogMeasurable.java b/src/main/java/org/opensourcephysics/display/LogMeasurable.java
similarity index 100%
rename from src/org/opensourcephysics/display/LogMeasurable.java
rename to src/main/java/org/opensourcephysics/display/LogMeasurable.java
diff --git a/src/org/opensourcephysics/display/Measurable.java b/src/main/java/org/opensourcephysics/display/Measurable.java
similarity index 100%
rename from src/org/opensourcephysics/display/Measurable.java
rename to src/main/java/org/opensourcephysics/display/Measurable.java
diff --git a/src/org/opensourcephysics/display/MeasuredCircle.java b/src/main/java/org/opensourcephysics/display/MeasuredCircle.java
similarity index 100%
rename from src/org/opensourcephysics/display/MeasuredCircle.java
rename to src/main/java/org/opensourcephysics/display/MeasuredCircle.java
diff --git a/src/org/opensourcephysics/display/MeasuredImage.java b/src/main/java/org/opensourcephysics/display/MeasuredImage.java
similarity index 100%
rename from src/org/opensourcephysics/display/MeasuredImage.java
rename to src/main/java/org/opensourcephysics/display/MeasuredImage.java
diff --git a/src/org/opensourcephysics/display/MouseHandler.java b/src/main/java/org/opensourcephysics/display/MouseHandler.java
similarity index 100%
rename from src/org/opensourcephysics/display/MouseHandler.java
rename to src/main/java/org/opensourcephysics/display/MouseHandler.java
diff --git a/src/org/opensourcephysics/display/OSPDialog.java b/src/main/java/org/opensourcephysics/display/OSPDialog.java
similarity index 100%
rename from src/org/opensourcephysics/display/OSPDialog.java
rename to src/main/java/org/opensourcephysics/display/OSPDialog.java
diff --git a/src/org/opensourcephysics/display/OSPFrame.java b/src/main/java/org/opensourcephysics/display/OSPFrame.java
similarity index 100%
rename from src/org/opensourcephysics/display/OSPFrame.java
rename to src/main/java/org/opensourcephysics/display/OSPFrame.java
diff --git a/src/org/opensourcephysics/display/OSPLayout.java b/src/main/java/org/opensourcephysics/display/OSPLayout.java
similarity index 100%
rename from src/org/opensourcephysics/display/OSPLayout.java
rename to src/main/java/org/opensourcephysics/display/OSPLayout.java
diff --git a/src/org/opensourcephysics/display/OSPRuntime.java b/src/main/java/org/opensourcephysics/display/OSPRuntime.java
similarity index 100%
rename from src/org/opensourcephysics/display/OSPRuntime.java
rename to src/main/java/org/opensourcephysics/display/OSPRuntime.java
diff --git a/src/org/opensourcephysics/display/PlottingPanel.java b/src/main/java/org/opensourcephysics/display/PlottingPanel.java
similarity index 100%
rename from src/org/opensourcephysics/display/PlottingPanel.java
rename to src/main/java/org/opensourcephysics/display/PlottingPanel.java
diff --git a/src/org/opensourcephysics/display/PlottingPanelFactory.java b/src/main/java/org/opensourcephysics/display/PlottingPanelFactory.java
similarity index 100%
rename from src/org/opensourcephysics/display/PlottingPanelFactory.java
rename to src/main/java/org/opensourcephysics/display/PlottingPanelFactory.java
diff --git a/src/org/opensourcephysics/display/PrintUtils.java b/src/main/java/org/opensourcephysics/display/PrintUtils.java
similarity index 100%
rename from src/org/opensourcephysics/display/PrintUtils.java
rename to src/main/java/org/opensourcephysics/display/PrintUtils.java
diff --git a/src/org/opensourcephysics/display/Protractor.java b/src/main/java/org/opensourcephysics/display/Protractor.java
similarity index 100%
rename from src/org/opensourcephysics/display/Protractor.java
rename to src/main/java/org/opensourcephysics/display/Protractor.java
diff --git a/src/org/opensourcephysics/display/Renderable.java b/src/main/java/org/opensourcephysics/display/Renderable.java
similarity index 100%
rename from src/org/opensourcephysics/display/Renderable.java
rename to src/main/java/org/opensourcephysics/display/Renderable.java
diff --git a/src/org/opensourcephysics/display/Selectable.java b/src/main/java/org/opensourcephysics/display/Selectable.java
similarity index 100%
rename from src/org/opensourcephysics/display/Selectable.java
rename to src/main/java/org/opensourcephysics/display/Selectable.java
diff --git a/src/org/opensourcephysics/display/SortDecorator.java b/src/main/java/org/opensourcephysics/display/SortDecorator.java
similarity index 100%
rename from src/org/opensourcephysics/display/SortDecorator.java
rename to src/main/java/org/opensourcephysics/display/SortDecorator.java
diff --git a/src/org/opensourcephysics/display/Spring.java b/src/main/java/org/opensourcephysics/display/Spring.java
similarity index 100%
rename from src/org/opensourcephysics/display/Spring.java
rename to src/main/java/org/opensourcephysics/display/Spring.java
diff --git a/src/org/opensourcephysics/display/Stripchart.java b/src/main/java/org/opensourcephysics/display/Stripchart.java
similarity index 100%
rename from src/org/opensourcephysics/display/Stripchart.java
rename to src/main/java/org/opensourcephysics/display/Stripchart.java
diff --git a/src/org/opensourcephysics/display/TeXParser.java b/src/main/java/org/opensourcephysics/display/TeXParser.java
similarity index 100%
rename from src/org/opensourcephysics/display/TeXParser.java
rename to src/main/java/org/opensourcephysics/display/TeXParser.java
diff --git a/src/org/opensourcephysics/display/TextBox.java b/src/main/java/org/opensourcephysics/display/TextBox.java
similarity index 100%
rename from src/org/opensourcephysics/display/TextBox.java
rename to src/main/java/org/opensourcephysics/display/TextBox.java
diff --git a/src/org/opensourcephysics/display/TextFrame.java b/src/main/java/org/opensourcephysics/display/TextFrame.java
similarity index 100%
rename from src/org/opensourcephysics/display/TextFrame.java
rename to src/main/java/org/opensourcephysics/display/TextFrame.java
diff --git a/src/org/opensourcephysics/display/TextLine.java b/src/main/java/org/opensourcephysics/display/TextLine.java
similarity index 100%
rename from src/org/opensourcephysics/display/TextLine.java
rename to src/main/java/org/opensourcephysics/display/TextLine.java
diff --git a/src/org/opensourcephysics/display/TextPanel.java b/src/main/java/org/opensourcephysics/display/TextPanel.java
similarity index 100%
rename from src/org/opensourcephysics/display/TextPanel.java
rename to src/main/java/org/opensourcephysics/display/TextPanel.java
diff --git a/src/org/opensourcephysics/display/TitleText.java b/src/main/java/org/opensourcephysics/display/TitleText.java
similarity index 100%
rename from src/org/opensourcephysics/display/TitleText.java
rename to src/main/java/org/opensourcephysics/display/TitleText.java
diff --git a/src/org/opensourcephysics/display/Trail.java b/src/main/java/org/opensourcephysics/display/Trail.java
similarity index 100%
rename from src/org/opensourcephysics/display/Trail.java
rename to src/main/java/org/opensourcephysics/display/Trail.java
diff --git a/src/org/opensourcephysics/display/TrailBezier.java b/src/main/java/org/opensourcephysics/display/TrailBezier.java
similarity index 100%
rename from src/org/opensourcephysics/display/TrailBezier.java
rename to src/main/java/org/opensourcephysics/display/TrailBezier.java
diff --git a/src/org/opensourcephysics/display/TrailSmart.java b/src/main/java/org/opensourcephysics/display/TrailSmart.java
similarity index 100%
rename from src/org/opensourcephysics/display/TrailSmart.java
rename to src/main/java/org/opensourcephysics/display/TrailSmart.java
diff --git a/src/org/opensourcephysics/display/axes/AbstractAxes.java b/src/main/java/org/opensourcephysics/display/axes/AbstractAxes.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/AbstractAxes.java
rename to src/main/java/org/opensourcephysics/display/axes/AbstractAxes.java
diff --git a/src/org/opensourcephysics/display/axes/AbstractPolarAxis.java b/src/main/java/org/opensourcephysics/display/axes/AbstractPolarAxis.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/AbstractPolarAxis.java
rename to src/main/java/org/opensourcephysics/display/axes/AbstractPolarAxis.java
diff --git a/src/org/opensourcephysics/display/axes/AxisFactory.java b/src/main/java/org/opensourcephysics/display/axes/AxisFactory.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/AxisFactory.java
rename to src/main/java/org/opensourcephysics/display/axes/AxisFactory.java
diff --git a/src/org/opensourcephysics/display/axes/CartesianAxes.java b/src/main/java/org/opensourcephysics/display/axes/CartesianAxes.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/CartesianAxes.java
rename to src/main/java/org/opensourcephysics/display/axes/CartesianAxes.java
diff --git a/src/org/opensourcephysics/display/axes/CartesianCoordinateStringBuilder.java b/src/main/java/org/opensourcephysics/display/axes/CartesianCoordinateStringBuilder.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/CartesianCoordinateStringBuilder.java
rename to src/main/java/org/opensourcephysics/display/axes/CartesianCoordinateStringBuilder.java
diff --git a/src/org/opensourcephysics/display/axes/CartesianInteractive.java b/src/main/java/org/opensourcephysics/display/axes/CartesianInteractive.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/CartesianInteractive.java
rename to src/main/java/org/opensourcephysics/display/axes/CartesianInteractive.java
diff --git a/src/org/opensourcephysics/display/axes/CartesianType1.java b/src/main/java/org/opensourcephysics/display/axes/CartesianType1.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/CartesianType1.java
rename to src/main/java/org/opensourcephysics/display/axes/CartesianType1.java
diff --git a/src/org/opensourcephysics/display/axes/CartesianType2.java b/src/main/java/org/opensourcephysics/display/axes/CartesianType2.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/CartesianType2.java
rename to src/main/java/org/opensourcephysics/display/axes/CartesianType2.java
diff --git a/src/org/opensourcephysics/display/axes/CartesianType3.java b/src/main/java/org/opensourcephysics/display/axes/CartesianType3.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/CartesianType3.java
rename to src/main/java/org/opensourcephysics/display/axes/CartesianType3.java
diff --git a/src/org/opensourcephysics/display/axes/CoordinateStringBuilder.java b/src/main/java/org/opensourcephysics/display/axes/CoordinateStringBuilder.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/CoordinateStringBuilder.java
rename to src/main/java/org/opensourcephysics/display/axes/CoordinateStringBuilder.java
diff --git a/src/org/opensourcephysics/display/axes/CustomAxes.java b/src/main/java/org/opensourcephysics/display/axes/CustomAxes.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/CustomAxes.java
rename to src/main/java/org/opensourcephysics/display/axes/CustomAxes.java
diff --git a/src/org/opensourcephysics/display/axes/DrawableAxes.java b/src/main/java/org/opensourcephysics/display/axes/DrawableAxes.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/DrawableAxes.java
rename to src/main/java/org/opensourcephysics/display/axes/DrawableAxes.java
diff --git a/src/org/opensourcephysics/display/axes/PolarAxes.java b/src/main/java/org/opensourcephysics/display/axes/PolarAxes.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/PolarAxes.java
rename to src/main/java/org/opensourcephysics/display/axes/PolarAxes.java
diff --git a/src/org/opensourcephysics/display/axes/PolarCoordinateStringBuilder.java b/src/main/java/org/opensourcephysics/display/axes/PolarCoordinateStringBuilder.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/PolarCoordinateStringBuilder.java
rename to src/main/java/org/opensourcephysics/display/axes/PolarCoordinateStringBuilder.java
diff --git a/src/org/opensourcephysics/display/axes/PolarType1.java b/src/main/java/org/opensourcephysics/display/axes/PolarType1.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/PolarType1.java
rename to src/main/java/org/opensourcephysics/display/axes/PolarType1.java
diff --git a/src/org/opensourcephysics/display/axes/PolarType2.java b/src/main/java/org/opensourcephysics/display/axes/PolarType2.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/PolarType2.java
rename to src/main/java/org/opensourcephysics/display/axes/PolarType2.java
diff --git a/src/org/opensourcephysics/display/axes/XAxis.java b/src/main/java/org/opensourcephysics/display/axes/XAxis.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/XAxis.java
rename to src/main/java/org/opensourcephysics/display/axes/XAxis.java
diff --git a/src/org/opensourcephysics/display/axes/XYAxis.java b/src/main/java/org/opensourcephysics/display/axes/XYAxis.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/XYAxis.java
rename to src/main/java/org/opensourcephysics/display/axes/XYAxis.java
diff --git a/src/org/opensourcephysics/display/axes/YAxis.java b/src/main/java/org/opensourcephysics/display/axes/YAxis.java
similarity index 100%
rename from src/org/opensourcephysics/display/axes/YAxis.java
rename to src/main/java/org/opensourcephysics/display/axes/YAxis.java
diff --git a/src/org/opensourcephysics/display/dialogs/AutoScaleInspector.java b/src/main/java/org/opensourcephysics/display/dialogs/AutoScaleInspector.java
similarity index 100%
rename from src/org/opensourcephysics/display/dialogs/AutoScaleInspector.java
rename to src/main/java/org/opensourcephysics/display/dialogs/AutoScaleInspector.java
diff --git a/src/org/opensourcephysics/display/dialogs/DecimalField.java b/src/main/java/org/opensourcephysics/display/dialogs/DecimalField.java
similarity index 100%
rename from src/org/opensourcephysics/display/dialogs/DecimalField.java
rename to src/main/java/org/opensourcephysics/display/dialogs/DecimalField.java
diff --git a/src/org/opensourcephysics/display/dialogs/DialogsRes.java b/src/main/java/org/opensourcephysics/display/dialogs/DialogsRes.java
similarity index 100%
rename from src/org/opensourcephysics/display/dialogs/DialogsRes.java
rename to src/main/java/org/opensourcephysics/display/dialogs/DialogsRes.java
diff --git a/src/org/opensourcephysics/display/dialogs/DrawingPanelInspector.java b/src/main/java/org/opensourcephysics/display/dialogs/DrawingPanelInspector.java
similarity index 100%
rename from src/org/opensourcephysics/display/dialogs/DrawingPanelInspector.java
rename to src/main/java/org/opensourcephysics/display/dialogs/DrawingPanelInspector.java
diff --git a/src/org/opensourcephysics/display/dialogs/LogAxesInspector.java b/src/main/java/org/opensourcephysics/display/dialogs/LogAxesInspector.java
similarity index 100%
rename from src/org/opensourcephysics/display/dialogs/LogAxesInspector.java
rename to src/main/java/org/opensourcephysics/display/dialogs/LogAxesInspector.java
diff --git a/src/org/opensourcephysics/display/dialogs/ScaleInspector.java b/src/main/java/org/opensourcephysics/display/dialogs/ScaleInspector.java
similarity index 100%
rename from src/org/opensourcephysics/display/dialogs/ScaleInspector.java
rename to src/main/java/org/opensourcephysics/display/dialogs/ScaleInspector.java
diff --git a/src/org/opensourcephysics/display/dialogs/XMLDrawingPanelInspector.java b/src/main/java/org/opensourcephysics/display/dialogs/XMLDrawingPanelInspector.java
similarity index 100%
rename from src/org/opensourcephysics/display/dialogs/XMLDrawingPanelInspector.java
rename to src/main/java/org/opensourcephysics/display/dialogs/XMLDrawingPanelInspector.java
diff --git a/src/org/opensourcephysics/display/doc-files/drawingframe_display.gif b/src/main/java/org/opensourcephysics/display/doc-files/drawingframe_display.gif
similarity index 100%
rename from src/org/opensourcephysics/display/doc-files/drawingframe_display.gif
rename to src/main/java/org/opensourcephysics/display/doc-files/drawingframe_display.gif
diff --git a/src/org/opensourcephysics/display/overview.html b/src/main/java/org/opensourcephysics/display/overview.html
similarity index 100%
rename from src/org/opensourcephysics/display/overview.html
rename to src/main/java/org/opensourcephysics/display/overview.html
diff --git a/src/org/opensourcephysics/display2d/ArrayData.java b/src/main/java/org/opensourcephysics/display2d/ArrayData.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ArrayData.java
rename to src/main/java/org/opensourcephysics/display2d/ArrayData.java
diff --git a/src/org/opensourcephysics/display2d/BinaryLattice.java b/src/main/java/org/opensourcephysics/display2d/BinaryLattice.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/BinaryLattice.java
rename to src/main/java/org/opensourcephysics/display2d/BinaryLattice.java
diff --git a/src/org/opensourcephysics/display2d/ByteLattice.java b/src/main/java/org/opensourcephysics/display2d/ByteLattice.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ByteLattice.java
rename to src/main/java/org/opensourcephysics/display2d/ByteLattice.java
diff --git a/src/org/opensourcephysics/display2d/ByteRaster.java b/src/main/java/org/opensourcephysics/display2d/ByteRaster.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ByteRaster.java
rename to src/main/java/org/opensourcephysics/display2d/ByteRaster.java
diff --git a/src/org/opensourcephysics/display2d/Carpet.java b/src/main/java/org/opensourcephysics/display2d/Carpet.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/Carpet.java
rename to src/main/java/org/opensourcephysics/display2d/Carpet.java
diff --git a/src/org/opensourcephysics/display2d/CellLattice.java b/src/main/java/org/opensourcephysics/display2d/CellLattice.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/CellLattice.java
rename to src/main/java/org/opensourcephysics/display2d/CellLattice.java
diff --git a/src/org/opensourcephysics/display2d/CellLatticeOSX.java b/src/main/java/org/opensourcephysics/display2d/CellLatticeOSX.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/CellLatticeOSX.java
rename to src/main/java/org/opensourcephysics/display2d/CellLatticeOSX.java
diff --git a/src/org/opensourcephysics/display2d/CellLatticePC.java b/src/main/java/org/opensourcephysics/display2d/CellLatticePC.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/CellLatticePC.java
rename to src/main/java/org/opensourcephysics/display2d/CellLatticePC.java
diff --git a/src/org/opensourcephysics/display2d/ColorMapper.java b/src/main/java/org/opensourcephysics/display2d/ColorMapper.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ColorMapper.java
rename to src/main/java/org/opensourcephysics/display2d/ColorMapper.java
diff --git a/src/org/opensourcephysics/display2d/ComplexCarpet.java b/src/main/java/org/opensourcephysics/display2d/ComplexCarpet.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ComplexCarpet.java
rename to src/main/java/org/opensourcephysics/display2d/ComplexCarpet.java
diff --git a/src/org/opensourcephysics/display2d/ComplexColorMapper.java b/src/main/java/org/opensourcephysics/display2d/ComplexColorMapper.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ComplexColorMapper.java
rename to src/main/java/org/opensourcephysics/display2d/ComplexColorMapper.java
diff --git a/src/org/opensourcephysics/display2d/ComplexContourPlot.java b/src/main/java/org/opensourcephysics/display2d/ComplexContourPlot.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ComplexContourPlot.java
rename to src/main/java/org/opensourcephysics/display2d/ComplexContourPlot.java
diff --git a/src/org/opensourcephysics/display2d/ComplexGridPlot.java b/src/main/java/org/opensourcephysics/display2d/ComplexGridPlot.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ComplexGridPlot.java
rename to src/main/java/org/opensourcephysics/display2d/ComplexGridPlot.java
diff --git a/src/org/opensourcephysics/display2d/ComplexInterpolatedPlot.java b/src/main/java/org/opensourcephysics/display2d/ComplexInterpolatedPlot.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ComplexInterpolatedPlot.java
rename to src/main/java/org/opensourcephysics/display2d/ComplexInterpolatedPlot.java
diff --git a/src/org/opensourcephysics/display2d/ComplexSurfacePlot.java b/src/main/java/org/opensourcephysics/display2d/ComplexSurfacePlot.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ComplexSurfacePlot.java
rename to src/main/java/org/opensourcephysics/display2d/ComplexSurfacePlot.java
diff --git a/src/org/opensourcephysics/display2d/ComplexSurfaceVertex.java b/src/main/java/org/opensourcephysics/display2d/ComplexSurfaceVertex.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ComplexSurfaceVertex.java
rename to src/main/java/org/opensourcephysics/display2d/ComplexSurfaceVertex.java
diff --git a/src/org/opensourcephysics/display2d/ContourAccumulator.java b/src/main/java/org/opensourcephysics/display2d/ContourAccumulator.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ContourAccumulator.java
rename to src/main/java/org/opensourcephysics/display2d/ContourAccumulator.java
diff --git a/src/org/opensourcephysics/display2d/ContourPlot.java b/src/main/java/org/opensourcephysics/display2d/ContourPlot.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ContourPlot.java
rename to src/main/java/org/opensourcephysics/display2d/ContourPlot.java
diff --git a/src/org/opensourcephysics/display2d/DataRaster.java b/src/main/java/org/opensourcephysics/display2d/DataRaster.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/DataRaster.java
rename to src/main/java/org/opensourcephysics/display2d/DataRaster.java
diff --git a/src/org/opensourcephysics/display2d/FlatData.java b/src/main/java/org/opensourcephysics/display2d/FlatData.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/FlatData.java
rename to src/main/java/org/opensourcephysics/display2d/FlatData.java
diff --git a/src/org/opensourcephysics/display2d/GrayscalePlot.java b/src/main/java/org/opensourcephysics/display2d/GrayscalePlot.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/GrayscalePlot.java
rename to src/main/java/org/opensourcephysics/display2d/GrayscalePlot.java
diff --git a/src/org/opensourcephysics/display2d/GridData.java b/src/main/java/org/opensourcephysics/display2d/GridData.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/GridData.java
rename to src/main/java/org/opensourcephysics/display2d/GridData.java
diff --git a/src/org/opensourcephysics/display2d/GridDataTable.java b/src/main/java/org/opensourcephysics/display2d/GridDataTable.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/GridDataTable.java
rename to src/main/java/org/opensourcephysics/display2d/GridDataTable.java
diff --git a/src/org/opensourcephysics/display2d/GridPlot.java b/src/main/java/org/opensourcephysics/display2d/GridPlot.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/GridPlot.java
rename to src/main/java/org/opensourcephysics/display2d/GridPlot.java
diff --git a/src/org/opensourcephysics/display2d/GridPointData.java b/src/main/java/org/opensourcephysics/display2d/GridPointData.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/GridPointData.java
rename to src/main/java/org/opensourcephysics/display2d/GridPointData.java
diff --git a/src/org/opensourcephysics/display2d/GridTableFrame.java b/src/main/java/org/opensourcephysics/display2d/GridTableFrame.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/GridTableFrame.java
rename to src/main/java/org/opensourcephysics/display2d/GridTableFrame.java
diff --git a/src/org/opensourcephysics/display2d/GridTableModel.java b/src/main/java/org/opensourcephysics/display2d/GridTableModel.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/GridTableModel.java
rename to src/main/java/org/opensourcephysics/display2d/GridTableModel.java
diff --git a/src/org/opensourcephysics/display2d/IntegerRaster.java b/src/main/java/org/opensourcephysics/display2d/IntegerRaster.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/IntegerRaster.java
rename to src/main/java/org/opensourcephysics/display2d/IntegerRaster.java
diff --git a/src/org/opensourcephysics/display2d/InterpolatedPlot.java b/src/main/java/org/opensourcephysics/display2d/InterpolatedPlot.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/InterpolatedPlot.java
rename to src/main/java/org/opensourcephysics/display2d/InterpolatedPlot.java
diff --git a/src/org/opensourcephysics/display2d/Plot2D.java b/src/main/java/org/opensourcephysics/display2d/Plot2D.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/Plot2D.java
rename to src/main/java/org/opensourcephysics/display2d/Plot2D.java
diff --git a/src/org/opensourcephysics/display2d/Plot2DLoader.java b/src/main/java/org/opensourcephysics/display2d/Plot2DLoader.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/Plot2DLoader.java
rename to src/main/java/org/opensourcephysics/display2d/Plot2DLoader.java
diff --git a/src/org/opensourcephysics/display2d/SiteLattice.java b/src/main/java/org/opensourcephysics/display2d/SiteLattice.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/SiteLattice.java
rename to src/main/java/org/opensourcephysics/display2d/SiteLattice.java
diff --git a/src/org/opensourcephysics/display2d/SurfacePlot.java b/src/main/java/org/opensourcephysics/display2d/SurfacePlot.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/SurfacePlot.java
rename to src/main/java/org/opensourcephysics/display2d/SurfacePlot.java
diff --git a/src/org/opensourcephysics/display2d/SurfacePlotMouseController.java b/src/main/java/org/opensourcephysics/display2d/SurfacePlotMouseController.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/SurfacePlotMouseController.java
rename to src/main/java/org/opensourcephysics/display2d/SurfacePlotMouseController.java
diff --git a/src/org/opensourcephysics/display2d/SurfacePlotProjector.java b/src/main/java/org/opensourcephysics/display2d/SurfacePlotProjector.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/SurfacePlotProjector.java
rename to src/main/java/org/opensourcephysics/display2d/SurfacePlotProjector.java
diff --git a/src/org/opensourcephysics/display2d/SurfaceVertex.java b/src/main/java/org/opensourcephysics/display2d/SurfaceVertex.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/SurfaceVertex.java
rename to src/main/java/org/opensourcephysics/display2d/SurfaceVertex.java
diff --git a/src/org/opensourcephysics/display2d/TestData.java b/src/main/java/org/opensourcephysics/display2d/TestData.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/TestData.java
rename to src/main/java/org/opensourcephysics/display2d/TestData.java
diff --git a/src/org/opensourcephysics/display2d/TriangularBinaryLattice.java b/src/main/java/org/opensourcephysics/display2d/TriangularBinaryLattice.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/TriangularBinaryLattice.java
rename to src/main/java/org/opensourcephysics/display2d/TriangularBinaryLattice.java
diff --git a/src/org/opensourcephysics/display2d/TriangularByteLattice.java b/src/main/java/org/opensourcephysics/display2d/TriangularByteLattice.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/TriangularByteLattice.java
rename to src/main/java/org/opensourcephysics/display2d/TriangularByteLattice.java
diff --git a/src/org/opensourcephysics/display2d/Util2D.java b/src/main/java/org/opensourcephysics/display2d/Util2D.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/Util2D.java
rename to src/main/java/org/opensourcephysics/display2d/Util2D.java
diff --git a/src/org/opensourcephysics/display2d/VectorColorMapper.java b/src/main/java/org/opensourcephysics/display2d/VectorColorMapper.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/VectorColorMapper.java
rename to src/main/java/org/opensourcephysics/display2d/VectorColorMapper.java
diff --git a/src/org/opensourcephysics/display2d/VectorPlot.java b/src/main/java/org/opensourcephysics/display2d/VectorPlot.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/VectorPlot.java
rename to src/main/java/org/opensourcephysics/display2d/VectorPlot.java
diff --git a/src/org/opensourcephysics/display2d/ZExpansion.java b/src/main/java/org/opensourcephysics/display2d/ZExpansion.java
similarity index 100%
rename from src/org/opensourcephysics/display2d/ZExpansion.java
rename to src/main/java/org/opensourcephysics/display2d/ZExpansion.java
diff --git a/src/org/opensourcephysics/display3d/core/Camera.java b/src/main/java/org/opensourcephysics/display3d/core/Camera.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/Camera.java
rename to src/main/java/org/opensourcephysics/display3d/core/Camera.java
diff --git a/src/org/opensourcephysics/display3d/core/CameraInspector.java b/src/main/java/org/opensourcephysics/display3d/core/CameraInspector.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/CameraInspector.java
rename to src/main/java/org/opensourcephysics/display3d/core/CameraInspector.java
diff --git a/src/org/opensourcephysics/display3d/core/DrawingFrame3D.java b/src/main/java/org/opensourcephysics/display3d/core/DrawingFrame3D.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/DrawingFrame3D.java
rename to src/main/java/org/opensourcephysics/display3d/core/DrawingFrame3D.java
diff --git a/src/org/opensourcephysics/display3d/core/DrawingPanel3D.java b/src/main/java/org/opensourcephysics/display3d/core/DrawingPanel3D.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/DrawingPanel3D.java
rename to src/main/java/org/opensourcephysics/display3d/core/DrawingPanel3D.java
diff --git a/src/org/opensourcephysics/display3d/core/Element.java b/src/main/java/org/opensourcephysics/display3d/core/Element.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/Element.java
rename to src/main/java/org/opensourcephysics/display3d/core/Element.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementArrow.java b/src/main/java/org/opensourcephysics/display3d/core/ElementArrow.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementArrow.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementArrow.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementBox.java b/src/main/java/org/opensourcephysics/display3d/core/ElementBox.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementBox.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementBox.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementCircle.java b/src/main/java/org/opensourcephysics/display3d/core/ElementCircle.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementCircle.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementCircle.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementCone.java b/src/main/java/org/opensourcephysics/display3d/core/ElementCone.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementCone.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementCone.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementCylinder.java b/src/main/java/org/opensourcephysics/display3d/core/ElementCylinder.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementCylinder.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementCylinder.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementEllipsoid.java b/src/main/java/org/opensourcephysics/display3d/core/ElementEllipsoid.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementEllipsoid.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementEllipsoid.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementImage.java b/src/main/java/org/opensourcephysics/display3d/core/ElementImage.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementImage.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementImage.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementObject.java b/src/main/java/org/opensourcephysics/display3d/core/ElementObject.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementObject.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementObject.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementPlane.java b/src/main/java/org/opensourcephysics/display3d/core/ElementPlane.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementPlane.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementPlane.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementPoints.java b/src/main/java/org/opensourcephysics/display3d/core/ElementPoints.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementPoints.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementPoints.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementPolygon.java b/src/main/java/org/opensourcephysics/display3d/core/ElementPolygon.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementPolygon.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementPolygon.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementSegment.java b/src/main/java/org/opensourcephysics/display3d/core/ElementSegment.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementSegment.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementSegment.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementSphere.java b/src/main/java/org/opensourcephysics/display3d/core/ElementSphere.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementSphere.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementSphere.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementSpring.java b/src/main/java/org/opensourcephysics/display3d/core/ElementSpring.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementSpring.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementSpring.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementSurface.java b/src/main/java/org/opensourcephysics/display3d/core/ElementSurface.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementSurface.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementSurface.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementTessellation.java b/src/main/java/org/opensourcephysics/display3d/core/ElementTessellation.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementTessellation.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementTessellation.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementTetrahedron.java b/src/main/java/org/opensourcephysics/display3d/core/ElementTetrahedron.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementTetrahedron.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementTetrahedron.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementText.java b/src/main/java/org/opensourcephysics/display3d/core/ElementText.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementText.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementText.java
diff --git a/src/org/opensourcephysics/display3d/core/ElementTrail.java b/src/main/java/org/opensourcephysics/display3d/core/ElementTrail.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/ElementTrail.java
rename to src/main/java/org/opensourcephysics/display3d/core/ElementTrail.java
diff --git a/src/org/opensourcephysics/display3d/core/Group.java b/src/main/java/org/opensourcephysics/display3d/core/Group.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/Group.java
rename to src/main/java/org/opensourcephysics/display3d/core/Group.java
diff --git a/src/org/opensourcephysics/display3d/core/Resolution.java b/src/main/java/org/opensourcephysics/display3d/core/Resolution.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/Resolution.java
rename to src/main/java/org/opensourcephysics/display3d/core/Resolution.java
diff --git a/src/org/opensourcephysics/display3d/core/Set.java b/src/main/java/org/opensourcephysics/display3d/core/Set.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/Set.java
rename to src/main/java/org/opensourcephysics/display3d/core/Set.java
diff --git a/src/org/opensourcephysics/display3d/core/Style.java b/src/main/java/org/opensourcephysics/display3d/core/Style.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/Style.java
rename to src/main/java/org/opensourcephysics/display3d/core/Style.java
diff --git a/src/org/opensourcephysics/display3d/core/VisualizationHints.java b/src/main/java/org/opensourcephysics/display3d/core/VisualizationHints.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/VisualizationHints.java
rename to src/main/java/org/opensourcephysics/display3d/core/VisualizationHints.java
diff --git a/src/org/opensourcephysics/display3d/core/interaction/InteractionEvent.java b/src/main/java/org/opensourcephysics/display3d/core/interaction/InteractionEvent.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/interaction/InteractionEvent.java
rename to src/main/java/org/opensourcephysics/display3d/core/interaction/InteractionEvent.java
diff --git a/src/org/opensourcephysics/display3d/core/interaction/InteractionListener.java b/src/main/java/org/opensourcephysics/display3d/core/interaction/InteractionListener.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/interaction/InteractionListener.java
rename to src/main/java/org/opensourcephysics/display3d/core/interaction/InteractionListener.java
diff --git a/src/org/opensourcephysics/display3d/core/interaction/InteractionSource.java b/src/main/java/org/opensourcephysics/display3d/core/interaction/InteractionSource.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/interaction/InteractionSource.java
rename to src/main/java/org/opensourcephysics/display3d/core/interaction/InteractionSource.java
diff --git a/src/org/opensourcephysics/display3d/core/interaction/InteractionTarget.java b/src/main/java/org/opensourcephysics/display3d/core/interaction/InteractionTarget.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/core/interaction/InteractionTarget.java
rename to src/main/java/org/opensourcephysics/display3d/core/interaction/InteractionTarget.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/AbstractTile.java b/src/main/java/org/opensourcephysics/display3d/simple3d/AbstractTile.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/AbstractTile.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/AbstractTile.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/Camera.java b/src/main/java/org/opensourcephysics/display3d/simple3d/Camera.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/Camera.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/Camera.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/DrawingFrame3D.java b/src/main/java/org/opensourcephysics/display3d/simple3d/DrawingFrame3D.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/DrawingFrame3D.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/DrawingFrame3D.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/DrawingPanel3D.java b/src/main/java/org/opensourcephysics/display3d/simple3d/DrawingPanel3D.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/DrawingPanel3D.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/DrawingPanel3D.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/Element.java b/src/main/java/org/opensourcephysics/display3d/simple3d/Element.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/Element.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/Element.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementArrow.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementArrow.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementArrow.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementArrow.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementBox.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementBox.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementBox.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementBox.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementCircle.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementCircle.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementCircle.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementCircle.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementCone.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementCone.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementCone.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementCone.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementCylinder.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementCylinder.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementCylinder.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementCylinder.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementEllipsoid.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementEllipsoid.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementEllipsoid.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementEllipsoid.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementImage.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementImage.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementImage.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementImage.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementObject.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementObject.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementObject.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementObject.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementPlane.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementPlane.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementPlane.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementPlane.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementPoints.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementPoints.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementPoints.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementPoints.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementPolygon.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementPolygon.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementPolygon.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementPolygon.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementSegment.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementSegment.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementSegment.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementSegment.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementSphere.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementSphere.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementSphere.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementSphere.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementSpring.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementSpring.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementSpring.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementSpring.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementSurface.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementSurface.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementSurface.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementSurface.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementTessellation.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementTessellation.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementTessellation.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementTessellation.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementTetrahedron.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementTetrahedron.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementTetrahedron.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementTetrahedron.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementText.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementText.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementText.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementText.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/ElementTrail.java b/src/main/java/org/opensourcephysics/display3d/simple3d/ElementTrail.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/ElementTrail.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/ElementTrail.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/Group.java b/src/main/java/org/opensourcephysics/display3d/simple3d/Group.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/Group.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/Group.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/InteractionTarget.java b/src/main/java/org/opensourcephysics/display3d/simple3d/InteractionTarget.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/InteractionTarget.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/InteractionTarget.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/Object3D.java b/src/main/java/org/opensourcephysics/display3d/simple3d/Object3D.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/Object3D.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/Object3D.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/Resolution.java b/src/main/java/org/opensourcephysics/display3d/simple3d/Resolution.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/Resolution.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/Resolution.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/Set.java b/src/main/java/org/opensourcephysics/display3d/simple3d/Set.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/Set.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/Set.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/Style.java b/src/main/java/org/opensourcephysics/display3d/simple3d/Style.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/Style.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/Style.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/VisualizationHints.java b/src/main/java/org/opensourcephysics/display3d/simple3d/VisualizationHints.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/VisualizationHints.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/VisualizationHints.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/utils/ConeUtils.java b/src/main/java/org/opensourcephysics/display3d/simple3d/utils/ConeUtils.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/utils/ConeUtils.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/utils/ConeUtils.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/utils/CylinderUtils.java b/src/main/java/org/opensourcephysics/display3d/simple3d/utils/CylinderUtils.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/utils/CylinderUtils.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/utils/CylinderUtils.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/utils/EllipsoidUtils.java b/src/main/java/org/opensourcephysics/display3d/simple3d/utils/EllipsoidUtils.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/utils/EllipsoidUtils.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/utils/EllipsoidUtils.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/utils/ShapeUtils.java b/src/main/java/org/opensourcephysics/display3d/simple3d/utils/ShapeUtils.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/utils/ShapeUtils.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/utils/ShapeUtils.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/utils/TetrahedronUtils.java b/src/main/java/org/opensourcephysics/display3d/simple3d/utils/TetrahedronUtils.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/utils/TetrahedronUtils.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/utils/TetrahedronUtils.java
diff --git a/src/org/opensourcephysics/display3d/simple3d/utils/VectorAlgebra.java b/src/main/java/org/opensourcephysics/display3d/simple3d/utils/VectorAlgebra.java
similarity index 100%
rename from src/org/opensourcephysics/display3d/simple3d/utils/VectorAlgebra.java
rename to src/main/java/org/opensourcephysics/display3d/simple3d/utils/VectorAlgebra.java
diff --git a/src/org/opensourcephysics/ejs/EjsRes.java b/src/main/java/org/opensourcephysics/ejs/EjsRes.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/EjsRes.java
rename to src/main/java/org/opensourcephysics/ejs/EjsRes.java
diff --git a/src/org/opensourcephysics/ejs/LauncherApplet.java b/src/main/java/org/opensourcephysics/ejs/LauncherApplet.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/LauncherApplet.java
rename to src/main/java/org/opensourcephysics/ejs/LauncherApplet.java
diff --git a/src/org/opensourcephysics/ejs/Model.java b/src/main/java/org/opensourcephysics/ejs/Model.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/Model.java
rename to src/main/java/org/opensourcephysics/ejs/Model.java
diff --git a/src/org/opensourcephysics/ejs/Simulation.java b/src/main/java/org/opensourcephysics/ejs/Simulation.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/Simulation.java
rename to src/main/java/org/opensourcephysics/ejs/Simulation.java
diff --git a/src/org/opensourcephysics/ejs/View.java b/src/main/java/org/opensourcephysics/ejs/View.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/View.java
rename to src/main/java/org/opensourcephysics/ejs/View.java
diff --git a/src/org/opensourcephysics/ejs/control/ConstantParser.java b/src/main/java/org/opensourcephysics/ejs/control/ConstantParser.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/ConstantParser.java
rename to src/main/java/org/opensourcephysics/ejs/control/ConstantParser.java
diff --git a/src/org/opensourcephysics/ejs/control/ControlElement.java b/src/main/java/org/opensourcephysics/ejs/control/ControlElement.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/ControlElement.java
rename to src/main/java/org/opensourcephysics/ejs/control/ControlElement.java
diff --git a/src/org/opensourcephysics/ejs/control/EjsCalculationControl.java b/src/main/java/org/opensourcephysics/ejs/control/EjsCalculationControl.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/EjsCalculationControl.java
rename to src/main/java/org/opensourcephysics/ejs/control/EjsCalculationControl.java
diff --git a/src/org/opensourcephysics/ejs/control/EjsControl.java b/src/main/java/org/opensourcephysics/ejs/control/EjsControl.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/EjsControl.java
rename to src/main/java/org/opensourcephysics/ejs/control/EjsControl.java
diff --git a/src/org/opensourcephysics/ejs/control/EjsControlFrame.java b/src/main/java/org/opensourcephysics/ejs/control/EjsControlFrame.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/EjsControlFrame.java
rename to src/main/java/org/opensourcephysics/ejs/control/EjsControlFrame.java
diff --git a/src/org/opensourcephysics/ejs/control/EjsSimulationControl.java b/src/main/java/org/opensourcephysics/ejs/control/EjsSimulationControl.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/EjsSimulationControl.java
rename to src/main/java/org/opensourcephysics/ejs/control/EjsSimulationControl.java
diff --git a/src/org/opensourcephysics/ejs/control/GroupControl.java b/src/main/java/org/opensourcephysics/ejs/control/GroupControl.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/GroupControl.java
rename to src/main/java/org/opensourcephysics/ejs/control/GroupControl.java
diff --git a/src/org/opensourcephysics/ejs/control/GroupVariable.java b/src/main/java/org/opensourcephysics/ejs/control/GroupVariable.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/GroupVariable.java
rename to src/main/java/org/opensourcephysics/ejs/control/GroupVariable.java
diff --git a/src/org/opensourcephysics/ejs/control/MethodWithOneParameter.java b/src/main/java/org/opensourcephysics/ejs/control/MethodWithOneParameter.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/MethodWithOneParameter.java
rename to src/main/java/org/opensourcephysics/ejs/control/MethodWithOneParameter.java
diff --git a/src/org/opensourcephysics/ejs/control/NeedsUpdate.java b/src/main/java/org/opensourcephysics/ejs/control/NeedsUpdate.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/NeedsUpdate.java
rename to src/main/java/org/opensourcephysics/ejs/control/NeedsUpdate.java
diff --git a/src/org/opensourcephysics/ejs/control/ParsedEjsControl.java b/src/main/java/org/opensourcephysics/ejs/control/ParsedEjsControl.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/ParsedEjsControl.java
rename to src/main/java/org/opensourcephysics/ejs/control/ParsedEjsControl.java
diff --git a/src/org/opensourcephysics/ejs/control/Utils.java b/src/main/java/org/opensourcephysics/ejs/control/Utils.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/Utils.java
rename to src/main/java/org/opensourcephysics/ejs/control/Utils.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ConstantParser.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ConstantParser.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ConstantParser.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ConstantParser.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlBar.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlBar.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlBar.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlBar.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlButton.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlButton.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlButton.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlButton.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlCheckBox.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlCheckBox.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlCheckBox.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlCheckBox.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlComboBox.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlComboBox.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlComboBox.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlComboBox.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlContainer.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlContainer.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlContainer.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlContainer.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlDialog.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlDialog.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlDialog.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlDialog.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlDrawable.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlDrawable.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlDrawable.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlDrawable.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlDrawablesParent.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlDrawablesParent.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlDrawablesParent.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlDrawablesParent.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlFrame.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlFrame.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlFrame.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlFrame.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlInputArea.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlInputArea.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlInputArea.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlInputArea.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlLabel.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlLabel.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlLabel.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlLabel.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlNumberField.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlNumberField.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlNumberField.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlNumberField.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlPanel.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlPanel.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlPanel.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlPanel.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlParsedNumberField.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlParsedNumberField.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlParsedNumberField.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlParsedNumberField.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlRadioButton.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlRadioButton.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlRadioButton.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlRadioButton.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlSlider.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlSlider.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlSlider.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlSlider.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlSound.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlSound.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlSound.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlSound.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlSplitPanel.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlSplitPanel.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlSplitPanel.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlSplitPanel.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlSwingElement.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlSwingElement.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlSwingElement.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlSwingElement.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlTabbedPanel.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlTabbedPanel.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlTabbedPanel.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlTabbedPanel.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlTextArea.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlTextArea.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlTextArea.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlTextArea.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlTextField.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlTextField.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlTextField.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlTextField.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/ControlWindow.java b/src/main/java/org/opensourcephysics/ejs/control/swing/ControlWindow.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/ControlWindow.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/ControlWindow.java
diff --git a/src/org/opensourcephysics/ejs/control/swing/NeedsPreUpdate.java b/src/main/java/org/opensourcephysics/ejs/control/swing/NeedsPreUpdate.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/swing/NeedsPreUpdate.java
rename to src/main/java/org/opensourcephysics/ejs/control/swing/NeedsPreUpdate.java
diff --git a/src/org/opensourcephysics/ejs/control/value/BooleanValue.java b/src/main/java/org/opensourcephysics/ejs/control/value/BooleanValue.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/value/BooleanValue.java
rename to src/main/java/org/opensourcephysics/ejs/control/value/BooleanValue.java
diff --git a/src/org/opensourcephysics/ejs/control/value/DoubleValue.java b/src/main/java/org/opensourcephysics/ejs/control/value/DoubleValue.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/value/DoubleValue.java
rename to src/main/java/org/opensourcephysics/ejs/control/value/DoubleValue.java
diff --git a/src/org/opensourcephysics/ejs/control/value/ExpressionValue.java b/src/main/java/org/opensourcephysics/ejs/control/value/ExpressionValue.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/value/ExpressionValue.java
rename to src/main/java/org/opensourcephysics/ejs/control/value/ExpressionValue.java
diff --git a/src/org/opensourcephysics/ejs/control/value/IntegerValue.java b/src/main/java/org/opensourcephysics/ejs/control/value/IntegerValue.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/value/IntegerValue.java
rename to src/main/java/org/opensourcephysics/ejs/control/value/IntegerValue.java
diff --git a/src/org/opensourcephysics/ejs/control/value/ObjectValue.java b/src/main/java/org/opensourcephysics/ejs/control/value/ObjectValue.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/value/ObjectValue.java
rename to src/main/java/org/opensourcephysics/ejs/control/value/ObjectValue.java
diff --git a/src/org/opensourcephysics/ejs/control/value/ParserException.java b/src/main/java/org/opensourcephysics/ejs/control/value/ParserException.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/value/ParserException.java
rename to src/main/java/org/opensourcephysics/ejs/control/value/ParserException.java
diff --git a/src/org/opensourcephysics/ejs/control/value/ParserSuryono.java b/src/main/java/org/opensourcephysics/ejs/control/value/ParserSuryono.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/value/ParserSuryono.java
rename to src/main/java/org/opensourcephysics/ejs/control/value/ParserSuryono.java
diff --git a/src/org/opensourcephysics/ejs/control/value/StringValue.java b/src/main/java/org/opensourcephysics/ejs/control/value/StringValue.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/value/StringValue.java
rename to src/main/java/org/opensourcephysics/ejs/control/value/StringValue.java
diff --git a/src/org/opensourcephysics/ejs/control/value/Value.java b/src/main/java/org/opensourcephysics/ejs/control/value/Value.java
similarity index 100%
rename from src/org/opensourcephysics/ejs/control/value/Value.java
rename to src/main/java/org/opensourcephysics/ejs/control/value/Value.java
diff --git a/src/org/opensourcephysics/frames/ArrayFrame.java b/src/main/java/org/opensourcephysics/frames/ArrayFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/ArrayFrame.java
rename to src/main/java/org/opensourcephysics/frames/ArrayFrame.java
diff --git a/src/org/opensourcephysics/frames/Complex2DFrame.java b/src/main/java/org/opensourcephysics/frames/Complex2DFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/Complex2DFrame.java
rename to src/main/java/org/opensourcephysics/frames/Complex2DFrame.java
diff --git a/src/org/opensourcephysics/frames/ComplexPlotFrame.java b/src/main/java/org/opensourcephysics/frames/ComplexPlotFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/ComplexPlotFrame.java
rename to src/main/java/org/opensourcephysics/frames/ComplexPlotFrame.java
diff --git a/src/org/opensourcephysics/frames/Display3DFrame.java b/src/main/java/org/opensourcephysics/frames/Display3DFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/Display3DFrame.java
rename to src/main/java/org/opensourcephysics/frames/Display3DFrame.java
diff --git a/src/org/opensourcephysics/frames/DisplayFrame.java b/src/main/java/org/opensourcephysics/frames/DisplayFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/DisplayFrame.java
rename to src/main/java/org/opensourcephysics/frames/DisplayFrame.java
diff --git a/src/org/opensourcephysics/frames/FFT2DFrame.java b/src/main/java/org/opensourcephysics/frames/FFT2DFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/FFT2DFrame.java
rename to src/main/java/org/opensourcephysics/frames/FFT2DFrame.java
diff --git a/src/org/opensourcephysics/frames/FFTFrame.java b/src/main/java/org/opensourcephysics/frames/FFTFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/FFTFrame.java
rename to src/main/java/org/opensourcephysics/frames/FFTFrame.java
diff --git a/src/org/opensourcephysics/frames/FFTRealFrame.java b/src/main/java/org/opensourcephysics/frames/FFTRealFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/FFTRealFrame.java
rename to src/main/java/org/opensourcephysics/frames/FFTRealFrame.java
diff --git a/src/org/opensourcephysics/frames/HistogramFrame.java b/src/main/java/org/opensourcephysics/frames/HistogramFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/HistogramFrame.java
rename to src/main/java/org/opensourcephysics/frames/HistogramFrame.java
diff --git a/src/org/opensourcephysics/frames/ImageFrame.java b/src/main/java/org/opensourcephysics/frames/ImageFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/ImageFrame.java
rename to src/main/java/org/opensourcephysics/frames/ImageFrame.java
diff --git a/src/org/opensourcephysics/frames/LatticeFrame.java b/src/main/java/org/opensourcephysics/frames/LatticeFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/LatticeFrame.java
rename to src/main/java/org/opensourcephysics/frames/LatticeFrame.java
diff --git a/src/org/opensourcephysics/frames/ParticleFrame.java b/src/main/java/org/opensourcephysics/frames/ParticleFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/ParticleFrame.java
rename to src/main/java/org/opensourcephysics/frames/ParticleFrame.java
diff --git a/src/org/opensourcephysics/frames/PlotFrame.java b/src/main/java/org/opensourcephysics/frames/PlotFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/PlotFrame.java
rename to src/main/java/org/opensourcephysics/frames/PlotFrame.java
diff --git a/src/org/opensourcephysics/frames/RasterFrame.java b/src/main/java/org/opensourcephysics/frames/RasterFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/RasterFrame.java
rename to src/main/java/org/opensourcephysics/frames/RasterFrame.java
diff --git a/src/org/opensourcephysics/frames/Scalar2DFrame.java b/src/main/java/org/opensourcephysics/frames/Scalar2DFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/Scalar2DFrame.java
rename to src/main/java/org/opensourcephysics/frames/Scalar2DFrame.java
diff --git a/src/org/opensourcephysics/frames/TableFrame.java b/src/main/java/org/opensourcephysics/frames/TableFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/TableFrame.java
rename to src/main/java/org/opensourcephysics/frames/TableFrame.java
diff --git a/src/org/opensourcephysics/frames/Vector2DFrame.java b/src/main/java/org/opensourcephysics/frames/Vector2DFrame.java
similarity index 100%
rename from src/org/opensourcephysics/frames/Vector2DFrame.java
rename to src/main/java/org/opensourcephysics/frames/Vector2DFrame.java
diff --git a/src/org/opensourcephysics/media/core/BaselineFilter.java b/src/main/java/org/opensourcephysics/media/core/BaselineFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/BaselineFilter.java
rename to src/main/java/org/opensourcephysics/media/core/BaselineFilter.java
diff --git a/src/org/opensourcephysics/media/core/BrightnessFilter.java b/src/main/java/org/opensourcephysics/media/core/BrightnessFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/BrightnessFilter.java
rename to src/main/java/org/opensourcephysics/media/core/BrightnessFilter.java
diff --git a/src/org/opensourcephysics/media/core/ClipControl.java b/src/main/java/org/opensourcephysics/media/core/ClipControl.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/ClipControl.java
rename to src/main/java/org/opensourcephysics/media/core/ClipControl.java
diff --git a/src/org/opensourcephysics/media/core/ClipInspector.java b/src/main/java/org/opensourcephysics/media/core/ClipInspector.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/ClipInspector.java
rename to src/main/java/org/opensourcephysics/media/core/ClipInspector.java
diff --git a/src/org/opensourcephysics/media/core/DarkGhostFilter.java b/src/main/java/org/opensourcephysics/media/core/DarkGhostFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/DarkGhostFilter.java
rename to src/main/java/org/opensourcephysics/media/core/DarkGhostFilter.java
diff --git a/src/org/opensourcephysics/media/core/DecimalField.java b/src/main/java/org/opensourcephysics/media/core/DecimalField.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/DecimalField.java
rename to src/main/java/org/opensourcephysics/media/core/DecimalField.java
diff --git a/src/org/opensourcephysics/media/core/DeinterlaceFilter.java b/src/main/java/org/opensourcephysics/media/core/DeinterlaceFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/DeinterlaceFilter.java
rename to src/main/java/org/opensourcephysics/media/core/DeinterlaceFilter.java
diff --git a/src/org/opensourcephysics/media/core/DoubleArray.java b/src/main/java/org/opensourcephysics/media/core/DoubleArray.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/DoubleArray.java
rename to src/main/java/org/opensourcephysics/media/core/DoubleArray.java
diff --git a/src/org/opensourcephysics/media/core/DrawableImage.java b/src/main/java/org/opensourcephysics/media/core/DrawableImage.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/DrawableImage.java
rename to src/main/java/org/opensourcephysics/media/core/DrawableImage.java
diff --git a/src/org/opensourcephysics/media/core/Filter.java b/src/main/java/org/opensourcephysics/media/core/Filter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/Filter.java
rename to src/main/java/org/opensourcephysics/media/core/Filter.java
diff --git a/src/org/opensourcephysics/media/core/FilterStack.java b/src/main/java/org/opensourcephysics/media/core/FilterStack.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/FilterStack.java
rename to src/main/java/org/opensourcephysics/media/core/FilterStack.java
diff --git a/src/org/opensourcephysics/media/core/GhostFilter.java b/src/main/java/org/opensourcephysics/media/core/GhostFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/GhostFilter.java
rename to src/main/java/org/opensourcephysics/media/core/GhostFilter.java
diff --git a/src/org/opensourcephysics/media/core/GrayScaleFilter.java b/src/main/java/org/opensourcephysics/media/core/GrayScaleFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/GrayScaleFilter.java
rename to src/main/java/org/opensourcephysics/media/core/GrayScaleFilter.java
diff --git a/src/org/opensourcephysics/media/core/ImageCoordSystem.java b/src/main/java/org/opensourcephysics/media/core/ImageCoordSystem.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/ImageCoordSystem.java
rename to src/main/java/org/opensourcephysics/media/core/ImageCoordSystem.java
diff --git a/src/org/opensourcephysics/media/core/ImageVideo.java b/src/main/java/org/opensourcephysics/media/core/ImageVideo.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/ImageVideo.java
rename to src/main/java/org/opensourcephysics/media/core/ImageVideo.java
diff --git a/src/org/opensourcephysics/media/core/ImageVideoRecorder.java b/src/main/java/org/opensourcephysics/media/core/ImageVideoRecorder.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/ImageVideoRecorder.java
rename to src/main/java/org/opensourcephysics/media/core/ImageVideoRecorder.java
diff --git a/src/org/opensourcephysics/media/core/ImageVideoType.java b/src/main/java/org/opensourcephysics/media/core/ImageVideoType.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/ImageVideoType.java
rename to src/main/java/org/opensourcephysics/media/core/ImageVideoType.java
diff --git a/src/org/opensourcephysics/media/core/IntegerField.java b/src/main/java/org/opensourcephysics/media/core/IntegerField.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/IntegerField.java
rename to src/main/java/org/opensourcephysics/media/core/IntegerField.java
diff --git a/src/org/opensourcephysics/media/core/InteractiveImage.java b/src/main/java/org/opensourcephysics/media/core/InteractiveImage.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/InteractiveImage.java
rename to src/main/java/org/opensourcephysics/media/core/InteractiveImage.java
diff --git a/src/org/opensourcephysics/media/core/MediaRes.java b/src/main/java/org/opensourcephysics/media/core/MediaRes.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/MediaRes.java
rename to src/main/java/org/opensourcephysics/media/core/MediaRes.java
diff --git a/src/org/opensourcephysics/media/core/NegativeFilter.java b/src/main/java/org/opensourcephysics/media/core/NegativeFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/NegativeFilter.java
rename to src/main/java/org/opensourcephysics/media/core/NegativeFilter.java
diff --git a/src/org/opensourcephysics/media/core/NumberField.java b/src/main/java/org/opensourcephysics/media/core/NumberField.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/NumberField.java
rename to src/main/java/org/opensourcephysics/media/core/NumberField.java
diff --git a/src/org/opensourcephysics/media/core/PerspectiveFilter.java b/src/main/java/org/opensourcephysics/media/core/PerspectiveFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/PerspectiveFilter.java
rename to src/main/java/org/opensourcephysics/media/core/PerspectiveFilter.java
diff --git a/src/org/opensourcephysics/media/core/Playable.java b/src/main/java/org/opensourcephysics/media/core/Playable.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/Playable.java
rename to src/main/java/org/opensourcephysics/media/core/Playable.java
diff --git a/src/org/opensourcephysics/media/core/RadialDistortionFilter.java b/src/main/java/org/opensourcephysics/media/core/RadialDistortionFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/RadialDistortionFilter.java
rename to src/main/java/org/opensourcephysics/media/core/RadialDistortionFilter.java
diff --git a/src/org/opensourcephysics/media/core/ResizeFilter.java b/src/main/java/org/opensourcephysics/media/core/ResizeFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/ResizeFilter.java
rename to src/main/java/org/opensourcephysics/media/core/ResizeFilter.java
diff --git a/src/org/opensourcephysics/media/core/RotateFilter.java b/src/main/java/org/opensourcephysics/media/core/RotateFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/RotateFilter.java
rename to src/main/java/org/opensourcephysics/media/core/RotateFilter.java
diff --git a/src/org/opensourcephysics/media/core/ScientificField.java b/src/main/java/org/opensourcephysics/media/core/ScientificField.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/ScientificField.java
rename to src/main/java/org/opensourcephysics/media/core/ScientificField.java
diff --git a/src/org/opensourcephysics/media/core/ScratchVideoRecorder.java b/src/main/java/org/opensourcephysics/media/core/ScratchVideoRecorder.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/ScratchVideoRecorder.java
rename to src/main/java/org/opensourcephysics/media/core/ScratchVideoRecorder.java
diff --git a/src/org/opensourcephysics/media/core/StepperClipControl.java b/src/main/java/org/opensourcephysics/media/core/StepperClipControl.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/StepperClipControl.java
rename to src/main/java/org/opensourcephysics/media/core/StepperClipControl.java
diff --git a/src/org/opensourcephysics/media/core/SumFilter.java b/src/main/java/org/opensourcephysics/media/core/SumFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/SumFilter.java
rename to src/main/java/org/opensourcephysics/media/core/SumFilter.java
diff --git a/src/org/opensourcephysics/media/core/TCircle.java b/src/main/java/org/opensourcephysics/media/core/TCircle.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/TCircle.java
rename to src/main/java/org/opensourcephysics/media/core/TCircle.java
diff --git a/src/org/opensourcephysics/media/core/TCoordAxes.java b/src/main/java/org/opensourcephysics/media/core/TCoordAxes.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/TCoordAxes.java
rename to src/main/java/org/opensourcephysics/media/core/TCoordAxes.java
diff --git a/src/org/opensourcephysics/media/core/TLine.java b/src/main/java/org/opensourcephysics/media/core/TLine.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/TLine.java
rename to src/main/java/org/opensourcephysics/media/core/TLine.java
diff --git a/src/org/opensourcephysics/media/core/TLineProfile.java b/src/main/java/org/opensourcephysics/media/core/TLineProfile.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/TLineProfile.java
rename to src/main/java/org/opensourcephysics/media/core/TLineProfile.java
diff --git a/src/org/opensourcephysics/media/core/TPoint.java b/src/main/java/org/opensourcephysics/media/core/TPoint.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/TPoint.java
rename to src/main/java/org/opensourcephysics/media/core/TPoint.java
diff --git a/src/org/opensourcephysics/media/core/TShape.java b/src/main/java/org/opensourcephysics/media/core/TShape.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/TShape.java
rename to src/main/java/org/opensourcephysics/media/core/TShape.java
diff --git a/src/org/opensourcephysics/media/core/TVector.java b/src/main/java/org/opensourcephysics/media/core/TVector.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/TVector.java
rename to src/main/java/org/opensourcephysics/media/core/TVector.java
diff --git a/src/org/opensourcephysics/media/core/TemplateMatcher.java b/src/main/java/org/opensourcephysics/media/core/TemplateMatcher.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/TemplateMatcher.java
rename to src/main/java/org/opensourcephysics/media/core/TemplateMatcher.java
diff --git a/src/org/opensourcephysics/media/core/Trackable.java b/src/main/java/org/opensourcephysics/media/core/Trackable.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/Trackable.java
rename to src/main/java/org/opensourcephysics/media/core/Trackable.java
diff --git a/src/org/opensourcephysics/media/core/TrackableCircle.java b/src/main/java/org/opensourcephysics/media/core/TrackableCircle.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/TrackableCircle.java
rename to src/main/java/org/opensourcephysics/media/core/TrackableCircle.java
diff --git a/src/org/opensourcephysics/media/core/TransformArray.java b/src/main/java/org/opensourcephysics/media/core/TransformArray.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/TransformArray.java
rename to src/main/java/org/opensourcephysics/media/core/TransformArray.java
diff --git a/src/org/opensourcephysics/media/core/VidCartesianCoordinateStringBuilder.java b/src/main/java/org/opensourcephysics/media/core/VidCartesianCoordinateStringBuilder.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VidCartesianCoordinateStringBuilder.java
rename to src/main/java/org/opensourcephysics/media/core/VidCartesianCoordinateStringBuilder.java
diff --git a/src/org/opensourcephysics/media/core/Video.java b/src/main/java/org/opensourcephysics/media/core/Video.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/Video.java
rename to src/main/java/org/opensourcephysics/media/core/Video.java
diff --git a/src/org/opensourcephysics/media/core/VideoAdapter.java b/src/main/java/org/opensourcephysics/media/core/VideoAdapter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VideoAdapter.java
rename to src/main/java/org/opensourcephysics/media/core/VideoAdapter.java
diff --git a/src/org/opensourcephysics/media/core/VideoClip.java b/src/main/java/org/opensourcephysics/media/core/VideoClip.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VideoClip.java
rename to src/main/java/org/opensourcephysics/media/core/VideoClip.java
diff --git a/src/org/opensourcephysics/media/core/VideoClipControl.java b/src/main/java/org/opensourcephysics/media/core/VideoClipControl.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VideoClipControl.java
rename to src/main/java/org/opensourcephysics/media/core/VideoClipControl.java
diff --git a/src/org/opensourcephysics/media/core/VideoFileFilter.java b/src/main/java/org/opensourcephysics/media/core/VideoFileFilter.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VideoFileFilter.java
rename to src/main/java/org/opensourcephysics/media/core/VideoFileFilter.java
diff --git a/src/org/opensourcephysics/media/core/VideoFrame.java b/src/main/java/org/opensourcephysics/media/core/VideoFrame.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VideoFrame.java
rename to src/main/java/org/opensourcephysics/media/core/VideoFrame.java
diff --git a/src/org/opensourcephysics/media/core/VideoGrabber.java b/src/main/java/org/opensourcephysics/media/core/VideoGrabber.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VideoGrabber.java
rename to src/main/java/org/opensourcephysics/media/core/VideoGrabber.java
diff --git a/src/org/opensourcephysics/media/core/VideoIO.java b/src/main/java/org/opensourcephysics/media/core/VideoIO.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VideoIO.java
rename to src/main/java/org/opensourcephysics/media/core/VideoIO.java
diff --git a/src/org/opensourcephysics/media/core/VideoMouseHandler.java b/src/main/java/org/opensourcephysics/media/core/VideoMouseHandler.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VideoMouseHandler.java
rename to src/main/java/org/opensourcephysics/media/core/VideoMouseHandler.java
diff --git a/src/org/opensourcephysics/media/core/VideoPanel.java b/src/main/java/org/opensourcephysics/media/core/VideoPanel.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VideoPanel.java
rename to src/main/java/org/opensourcephysics/media/core/VideoPanel.java
diff --git a/src/org/opensourcephysics/media/core/VideoPlayer.java b/src/main/java/org/opensourcephysics/media/core/VideoPlayer.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VideoPlayer.java
rename to src/main/java/org/opensourcephysics/media/core/VideoPlayer.java
diff --git a/src/org/opensourcephysics/media/core/VideoRecorder.java b/src/main/java/org/opensourcephysics/media/core/VideoRecorder.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VideoRecorder.java
rename to src/main/java/org/opensourcephysics/media/core/VideoRecorder.java
diff --git a/src/org/opensourcephysics/media/core/VideoType.java b/src/main/java/org/opensourcephysics/media/core/VideoType.java
similarity index 100%
rename from src/org/opensourcephysics/media/core/VideoType.java
rename to src/main/java/org/opensourcephysics/media/core/VideoType.java
diff --git a/src/org/opensourcephysics/media/gif/AnimatedGifEncoder.java b/src/main/java/org/opensourcephysics/media/gif/AnimatedGifEncoder.java
similarity index 100%
rename from src/org/opensourcephysics/media/gif/AnimatedGifEncoder.java
rename to src/main/java/org/opensourcephysics/media/gif/AnimatedGifEncoder.java
diff --git a/src/org/opensourcephysics/media/gif/GIFEncoder.java b/src/main/java/org/opensourcephysics/media/gif/GIFEncoder.java
similarity index 100%
rename from src/org/opensourcephysics/media/gif/GIFEncoder.java
rename to src/main/java/org/opensourcephysics/media/gif/GIFEncoder.java
diff --git a/src/org/opensourcephysics/media/gif/GifDecoder.java b/src/main/java/org/opensourcephysics/media/gif/GifDecoder.java
similarity index 100%
rename from src/org/opensourcephysics/media/gif/GifDecoder.java
rename to src/main/java/org/opensourcephysics/media/gif/GifDecoder.java
diff --git a/src/org/opensourcephysics/media/gif/GifVideo.java b/src/main/java/org/opensourcephysics/media/gif/GifVideo.java
similarity index 100%
rename from src/org/opensourcephysics/media/gif/GifVideo.java
rename to src/main/java/org/opensourcephysics/media/gif/GifVideo.java
diff --git a/src/org/opensourcephysics/media/gif/GifVideoRecorder.java b/src/main/java/org/opensourcephysics/media/gif/GifVideoRecorder.java
similarity index 100%
rename from src/org/opensourcephysics/media/gif/GifVideoRecorder.java
rename to src/main/java/org/opensourcephysics/media/gif/GifVideoRecorder.java
diff --git a/src/org/opensourcephysics/media/gif/GifVideoType.java b/src/main/java/org/opensourcephysics/media/gif/GifVideoType.java
similarity index 100%
rename from src/org/opensourcephysics/media/gif/GifVideoType.java
rename to src/main/java/org/opensourcephysics/media/gif/GifVideoType.java
diff --git a/src/org/opensourcephysics/media/gif/LZWEncoder.java b/src/main/java/org/opensourcephysics/media/gif/LZWEncoder.java
similarity index 100%
rename from src/org/opensourcephysics/media/gif/LZWEncoder.java
rename to src/main/java/org/opensourcephysics/media/gif/LZWEncoder.java
diff --git a/src/org/opensourcephysics/media/gif/NeuQuant.java b/src/main/java/org/opensourcephysics/media/gif/NeuQuant.java
similarity index 100%
rename from src/org/opensourcephysics/media/gif/NeuQuant.java
rename to src/main/java/org/opensourcephysics/media/gif/NeuQuant.java
diff --git a/src/org/opensourcephysics/numerics/AbstractODESolver.java b/src/main/java/org/opensourcephysics/numerics/AbstractODESolver.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/AbstractODESolver.java
rename to src/main/java/org/opensourcephysics/numerics/AbstractODESolver.java
diff --git a/src/org/opensourcephysics/numerics/Adams4.java b/src/main/java/org/opensourcephysics/numerics/Adams4.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Adams4.java
rename to src/main/java/org/opensourcephysics/numerics/Adams4.java
diff --git a/src/org/opensourcephysics/numerics/Adams5.java b/src/main/java/org/opensourcephysics/numerics/Adams5.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Adams5.java
rename to src/main/java/org/opensourcephysics/numerics/Adams5.java
diff --git a/src/org/opensourcephysics/numerics/Adams6.java b/src/main/java/org/opensourcephysics/numerics/Adams6.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Adams6.java
rename to src/main/java/org/opensourcephysics/numerics/Adams6.java
diff --git a/src/org/opensourcephysics/numerics/ArrayLib.java b/src/main/java/org/opensourcephysics/numerics/ArrayLib.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ArrayLib.java
rename to src/main/java/org/opensourcephysics/numerics/ArrayLib.java
diff --git a/src/org/opensourcephysics/numerics/Butcher5.java b/src/main/java/org/opensourcephysics/numerics/Butcher5.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Butcher5.java
rename to src/main/java/org/opensourcephysics/numerics/Butcher5.java
diff --git a/src/org/opensourcephysics/numerics/CashKarp45.java b/src/main/java/org/opensourcephysics/numerics/CashKarp45.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/CashKarp45.java
rename to src/main/java/org/opensourcephysics/numerics/CashKarp45.java
diff --git a/src/org/opensourcephysics/numerics/Complex.java b/src/main/java/org/opensourcephysics/numerics/Complex.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Complex.java
rename to src/main/java/org/opensourcephysics/numerics/Complex.java
diff --git a/src/org/opensourcephysics/numerics/ComplexEigenvalueDecomposition.java b/src/main/java/org/opensourcephysics/numerics/ComplexEigenvalueDecomposition.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ComplexEigenvalueDecomposition.java
rename to src/main/java/org/opensourcephysics/numerics/ComplexEigenvalueDecomposition.java
diff --git a/src/org/opensourcephysics/numerics/ComplexMatrix.java b/src/main/java/org/opensourcephysics/numerics/ComplexMatrix.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ComplexMatrix.java
rename to src/main/java/org/opensourcephysics/numerics/ComplexMatrix.java
diff --git a/src/org/opensourcephysics/numerics/CubicSpline.java b/src/main/java/org/opensourcephysics/numerics/CubicSpline.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/CubicSpline.java
rename to src/main/java/org/opensourcephysics/numerics/CubicSpline.java
diff --git a/src/org/opensourcephysics/numerics/CurveFitting.java b/src/main/java/org/opensourcephysics/numerics/CurveFitting.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/CurveFitting.java
rename to src/main/java/org/opensourcephysics/numerics/CurveFitting.java
diff --git a/src/org/opensourcephysics/numerics/Derivative.java b/src/main/java/org/opensourcephysics/numerics/Derivative.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Derivative.java
rename to src/main/java/org/opensourcephysics/numerics/Derivative.java
diff --git a/src/org/opensourcephysics/numerics/DormandPrince45.java b/src/main/java/org/opensourcephysics/numerics/DormandPrince45.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/DormandPrince45.java
rename to src/main/java/org/opensourcephysics/numerics/DormandPrince45.java
diff --git a/src/org/opensourcephysics/numerics/DoubleArray.java b/src/main/java/org/opensourcephysics/numerics/DoubleArray.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/DoubleArray.java
rename to src/main/java/org/opensourcephysics/numerics/DoubleArray.java
diff --git a/src/org/opensourcephysics/numerics/EigenvalueDecomposition.java b/src/main/java/org/opensourcephysics/numerics/EigenvalueDecomposition.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/EigenvalueDecomposition.java
rename to src/main/java/org/opensourcephysics/numerics/EigenvalueDecomposition.java
diff --git a/src/org/opensourcephysics/numerics/Euler.java b/src/main/java/org/opensourcephysics/numerics/Euler.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Euler.java
rename to src/main/java/org/opensourcephysics/numerics/Euler.java
diff --git a/src/org/opensourcephysics/numerics/EulerRichardson.java b/src/main/java/org/opensourcephysics/numerics/EulerRichardson.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/EulerRichardson.java
rename to src/main/java/org/opensourcephysics/numerics/EulerRichardson.java
diff --git a/src/org/opensourcephysics/numerics/FFT.java b/src/main/java/org/opensourcephysics/numerics/FFT.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/FFT.java
rename to src/main/java/org/opensourcephysics/numerics/FFT.java
diff --git a/src/org/opensourcephysics/numerics/FFT2D.java b/src/main/java/org/opensourcephysics/numerics/FFT2D.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/FFT2D.java
rename to src/main/java/org/opensourcephysics/numerics/FFT2D.java
diff --git a/src/org/opensourcephysics/numerics/FFTReal.java b/src/main/java/org/opensourcephysics/numerics/FFTReal.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/FFTReal.java
rename to src/main/java/org/opensourcephysics/numerics/FFTReal.java
diff --git a/src/org/opensourcephysics/numerics/Fehlberg8.java b/src/main/java/org/opensourcephysics/numerics/Fehlberg8.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Fehlberg8.java
rename to src/main/java/org/opensourcephysics/numerics/Fehlberg8.java
diff --git a/src/org/opensourcephysics/numerics/Function.java b/src/main/java/org/opensourcephysics/numerics/Function.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Function.java
rename to src/main/java/org/opensourcephysics/numerics/Function.java
diff --git a/src/org/opensourcephysics/numerics/FunctionTransform.java b/src/main/java/org/opensourcephysics/numerics/FunctionTransform.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/FunctionTransform.java
rename to src/main/java/org/opensourcephysics/numerics/FunctionTransform.java
diff --git a/src/org/opensourcephysics/numerics/HessianMinimize.java b/src/main/java/org/opensourcephysics/numerics/HessianMinimize.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/HessianMinimize.java
rename to src/main/java/org/opensourcephysics/numerics/HessianMinimize.java
diff --git a/src/org/opensourcephysics/numerics/Heun3.java b/src/main/java/org/opensourcephysics/numerics/Heun3.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Heun3.java
rename to src/main/java/org/opensourcephysics/numerics/Heun3.java
diff --git a/src/org/opensourcephysics/numerics/IntegerArray.java b/src/main/java/org/opensourcephysics/numerics/IntegerArray.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/IntegerArray.java
rename to src/main/java/org/opensourcephysics/numerics/IntegerArray.java
diff --git a/src/org/opensourcephysics/numerics/Integral.java b/src/main/java/org/opensourcephysics/numerics/Integral.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Integral.java
rename to src/main/java/org/opensourcephysics/numerics/Integral.java
diff --git a/src/org/opensourcephysics/numerics/Interpolation.java b/src/main/java/org/opensourcephysics/numerics/Interpolation.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Interpolation.java
rename to src/main/java/org/opensourcephysics/numerics/Interpolation.java
diff --git a/src/org/opensourcephysics/numerics/InvertibleFunction.java b/src/main/java/org/opensourcephysics/numerics/InvertibleFunction.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/InvertibleFunction.java
rename to src/main/java/org/opensourcephysics/numerics/InvertibleFunction.java
diff --git a/src/org/opensourcephysics/numerics/LUPDecomposition.java b/src/main/java/org/opensourcephysics/numerics/LUPDecomposition.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/LUPDecomposition.java
rename to src/main/java/org/opensourcephysics/numerics/LUPDecomposition.java
diff --git a/src/org/opensourcephysics/numerics/LagrangeInterpolator.java b/src/main/java/org/opensourcephysics/numerics/LagrangeInterpolator.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/LagrangeInterpolator.java
rename to src/main/java/org/opensourcephysics/numerics/LagrangeInterpolator.java
diff --git a/src/org/opensourcephysics/numerics/LeapFrog.java b/src/main/java/org/opensourcephysics/numerics/LeapFrog.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/LeapFrog.java
rename to src/main/java/org/opensourcephysics/numerics/LeapFrog.java
diff --git a/src/org/opensourcephysics/numerics/Legendre.java b/src/main/java/org/opensourcephysics/numerics/Legendre.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Legendre.java
rename to src/main/java/org/opensourcephysics/numerics/Legendre.java
diff --git a/src/org/opensourcephysics/numerics/LevenbergMarquardt.java b/src/main/java/org/opensourcephysics/numerics/LevenbergMarquardt.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/LevenbergMarquardt.java
rename to src/main/java/org/opensourcephysics/numerics/LevenbergMarquardt.java
diff --git a/src/org/opensourcephysics/numerics/LogBase10Function.java b/src/main/java/org/opensourcephysics/numerics/LogBase10Function.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/LogBase10Function.java
rename to src/main/java/org/opensourcephysics/numerics/LogBase10Function.java
diff --git a/src/org/opensourcephysics/numerics/MathExpParser.java b/src/main/java/org/opensourcephysics/numerics/MathExpParser.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/MathExpParser.java
rename to src/main/java/org/opensourcephysics/numerics/MathExpParser.java
diff --git a/src/org/opensourcephysics/numerics/Matrix2DTransformation.java b/src/main/java/org/opensourcephysics/numerics/Matrix2DTransformation.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Matrix2DTransformation.java
rename to src/main/java/org/opensourcephysics/numerics/Matrix2DTransformation.java
diff --git a/src/org/opensourcephysics/numerics/Matrix3DTransformation.java b/src/main/java/org/opensourcephysics/numerics/Matrix3DTransformation.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Matrix3DTransformation.java
rename to src/main/java/org/opensourcephysics/numerics/Matrix3DTransformation.java
diff --git a/src/org/opensourcephysics/numerics/MatrixTransformation.java b/src/main/java/org/opensourcephysics/numerics/MatrixTransformation.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/MatrixTransformation.java
rename to src/main/java/org/opensourcephysics/numerics/MatrixTransformation.java
diff --git a/src/org/opensourcephysics/numerics/MultiVarFunction.java b/src/main/java/org/opensourcephysics/numerics/MultiVarFunction.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/MultiVarFunction.java
rename to src/main/java/org/opensourcephysics/numerics/MultiVarFunction.java
diff --git a/src/org/opensourcephysics/numerics/NumericMethodException.java b/src/main/java/org/opensourcephysics/numerics/NumericMethodException.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/NumericMethodException.java
rename to src/main/java/org/opensourcephysics/numerics/NumericMethodException.java
diff --git a/src/org/opensourcephysics/numerics/NumericsLog.java b/src/main/java/org/opensourcephysics/numerics/NumericsLog.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/NumericsLog.java
rename to src/main/java/org/opensourcephysics/numerics/NumericsLog.java
diff --git a/src/org/opensourcephysics/numerics/ODE.java b/src/main/java/org/opensourcephysics/numerics/ODE.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ODE.java
rename to src/main/java/org/opensourcephysics/numerics/ODE.java
diff --git a/src/org/opensourcephysics/numerics/ODEAdaptiveSolver.java b/src/main/java/org/opensourcephysics/numerics/ODEAdaptiveSolver.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ODEAdaptiveSolver.java
rename to src/main/java/org/opensourcephysics/numerics/ODEAdaptiveSolver.java
diff --git a/src/org/opensourcephysics/numerics/ODEBisectionEventSolver.java b/src/main/java/org/opensourcephysics/numerics/ODEBisectionEventSolver.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ODEBisectionEventSolver.java
rename to src/main/java/org/opensourcephysics/numerics/ODEBisectionEventSolver.java
diff --git a/src/org/opensourcephysics/numerics/ODEEventSolver.java b/src/main/java/org/opensourcephysics/numerics/ODEEventSolver.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ODEEventSolver.java
rename to src/main/java/org/opensourcephysics/numerics/ODEEventSolver.java
diff --git a/src/org/opensourcephysics/numerics/ODEInterpolationSolver.java b/src/main/java/org/opensourcephysics/numerics/ODEInterpolationSolver.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ODEInterpolationSolver.java
rename to src/main/java/org/opensourcephysics/numerics/ODEInterpolationSolver.java
diff --git a/src/org/opensourcephysics/numerics/ODEMultistepSolver.java b/src/main/java/org/opensourcephysics/numerics/ODEMultistepSolver.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ODEMultistepSolver.java
rename to src/main/java/org/opensourcephysics/numerics/ODEMultistepSolver.java
diff --git a/src/org/opensourcephysics/numerics/ODESolver.java b/src/main/java/org/opensourcephysics/numerics/ODESolver.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ODESolver.java
rename to src/main/java/org/opensourcephysics/numerics/ODESolver.java
diff --git a/src/org/opensourcephysics/numerics/ODESolverException.java b/src/main/java/org/opensourcephysics/numerics/ODESolverException.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ODESolverException.java
rename to src/main/java/org/opensourcephysics/numerics/ODESolverException.java
diff --git a/src/org/opensourcephysics/numerics/ODESolverFactory.java b/src/main/java/org/opensourcephysics/numerics/ODESolverFactory.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ODESolverFactory.java
rename to src/main/java/org/opensourcephysics/numerics/ODESolverFactory.java
diff --git a/src/org/opensourcephysics/numerics/PBC.java b/src/main/java/org/opensourcephysics/numerics/PBC.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/PBC.java
rename to src/main/java/org/opensourcephysics/numerics/PBC.java
diff --git a/src/org/opensourcephysics/numerics/ParsedFunction.java b/src/main/java/org/opensourcephysics/numerics/ParsedFunction.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ParsedFunction.java
rename to src/main/java/org/opensourcephysics/numerics/ParsedFunction.java
diff --git a/src/org/opensourcephysics/numerics/ParsedMultiVarFunction.java b/src/main/java/org/opensourcephysics/numerics/ParsedMultiVarFunction.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ParsedMultiVarFunction.java
rename to src/main/java/org/opensourcephysics/numerics/ParsedMultiVarFunction.java
diff --git a/src/org/opensourcephysics/numerics/ParserException.java b/src/main/java/org/opensourcephysics/numerics/ParserException.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/ParserException.java
rename to src/main/java/org/opensourcephysics/numerics/ParserException.java
diff --git a/src/org/opensourcephysics/numerics/Polynomial.java b/src/main/java/org/opensourcephysics/numerics/Polynomial.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Polynomial.java
rename to src/main/java/org/opensourcephysics/numerics/Polynomial.java
diff --git a/src/org/opensourcephysics/numerics/PolynomialLeastSquareFit.java b/src/main/java/org/opensourcephysics/numerics/PolynomialLeastSquareFit.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/PolynomialLeastSquareFit.java
rename to src/main/java/org/opensourcephysics/numerics/PolynomialLeastSquareFit.java
diff --git a/src/org/opensourcephysics/numerics/Quaternion.java b/src/main/java/org/opensourcephysics/numerics/Quaternion.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Quaternion.java
rename to src/main/java/org/opensourcephysics/numerics/Quaternion.java
diff --git a/src/org/opensourcephysics/numerics/RK4.java b/src/main/java/org/opensourcephysics/numerics/RK4.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/RK4.java
rename to src/main/java/org/opensourcephysics/numerics/RK4.java
diff --git a/src/org/opensourcephysics/numerics/RK45.java b/src/main/java/org/opensourcephysics/numerics/RK45.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/RK45.java
rename to src/main/java/org/opensourcephysics/numerics/RK45.java
diff --git a/src/org/opensourcephysics/numerics/RK45MultiStep.java b/src/main/java/org/opensourcephysics/numerics/RK45MultiStep.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/RK45MultiStep.java
rename to src/main/java/org/opensourcephysics/numerics/RK45MultiStep.java
diff --git a/src/org/opensourcephysics/numerics/Ralston2.java b/src/main/java/org/opensourcephysics/numerics/Ralston2.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Ralston2.java
rename to src/main/java/org/opensourcephysics/numerics/Ralston2.java
diff --git a/src/org/opensourcephysics/numerics/Root.java b/src/main/java/org/opensourcephysics/numerics/Root.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Root.java
rename to src/main/java/org/opensourcephysics/numerics/Root.java
diff --git a/src/org/opensourcephysics/numerics/StateEvent.java b/src/main/java/org/opensourcephysics/numerics/StateEvent.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/StateEvent.java
rename to src/main/java/org/opensourcephysics/numerics/StateEvent.java
diff --git a/src/org/opensourcephysics/numerics/SuryonoParser.java b/src/main/java/org/opensourcephysics/numerics/SuryonoParser.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/SuryonoParser.java
rename to src/main/java/org/opensourcephysics/numerics/SuryonoParser.java
diff --git a/src/org/opensourcephysics/numerics/Transformation.java b/src/main/java/org/opensourcephysics/numerics/Transformation.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Transformation.java
rename to src/main/java/org/opensourcephysics/numerics/Transformation.java
diff --git a/src/org/opensourcephysics/numerics/TriggerODE.java b/src/main/java/org/opensourcephysics/numerics/TriggerODE.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/TriggerODE.java
rename to src/main/java/org/opensourcephysics/numerics/TriggerODE.java
diff --git a/src/org/opensourcephysics/numerics/Util.java b/src/main/java/org/opensourcephysics/numerics/Util.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Util.java
rename to src/main/java/org/opensourcephysics/numerics/Util.java
diff --git a/src/org/opensourcephysics/numerics/Vec3D.java b/src/main/java/org/opensourcephysics/numerics/Vec3D.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Vec3D.java
rename to src/main/java/org/opensourcephysics/numerics/Vec3D.java
diff --git a/src/org/opensourcephysics/numerics/VectorFunction.java b/src/main/java/org/opensourcephysics/numerics/VectorFunction.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/VectorFunction.java
rename to src/main/java/org/opensourcephysics/numerics/VectorFunction.java
diff --git a/src/org/opensourcephysics/numerics/VectorMath.java b/src/main/java/org/opensourcephysics/numerics/VectorMath.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/VectorMath.java
rename to src/main/java/org/opensourcephysics/numerics/VectorMath.java
diff --git a/src/org/opensourcephysics/numerics/Verlet.java b/src/main/java/org/opensourcephysics/numerics/Verlet.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/Verlet.java
rename to src/main/java/org/opensourcephysics/numerics/Verlet.java
diff --git a/src/org/opensourcephysics/numerics/specialfunctions/Airy.java b/src/main/java/org/opensourcephysics/numerics/specialfunctions/Airy.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/specialfunctions/Airy.java
rename to src/main/java/org/opensourcephysics/numerics/specialfunctions/Airy.java
diff --git a/src/org/opensourcephysics/numerics/specialfunctions/Bessel.java b/src/main/java/org/opensourcephysics/numerics/specialfunctions/Bessel.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/specialfunctions/Bessel.java
rename to src/main/java/org/opensourcephysics/numerics/specialfunctions/Bessel.java
diff --git a/src/org/opensourcephysics/numerics/specialfunctions/Chebyshev.java b/src/main/java/org/opensourcephysics/numerics/specialfunctions/Chebyshev.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/specialfunctions/Chebyshev.java
rename to src/main/java/org/opensourcephysics/numerics/specialfunctions/Chebyshev.java
diff --git a/src/org/opensourcephysics/numerics/specialfunctions/ErrorFunction.java b/src/main/java/org/opensourcephysics/numerics/specialfunctions/ErrorFunction.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/specialfunctions/ErrorFunction.java
rename to src/main/java/org/opensourcephysics/numerics/specialfunctions/ErrorFunction.java
diff --git a/src/org/opensourcephysics/numerics/specialfunctions/Factorials.java b/src/main/java/org/opensourcephysics/numerics/specialfunctions/Factorials.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/specialfunctions/Factorials.java
rename to src/main/java/org/opensourcephysics/numerics/specialfunctions/Factorials.java
diff --git a/src/org/opensourcephysics/numerics/specialfunctions/Gamma.java b/src/main/java/org/opensourcephysics/numerics/specialfunctions/Gamma.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/specialfunctions/Gamma.java
rename to src/main/java/org/opensourcephysics/numerics/specialfunctions/Gamma.java
diff --git a/src/org/opensourcephysics/numerics/specialfunctions/Hermite.java b/src/main/java/org/opensourcephysics/numerics/specialfunctions/Hermite.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/specialfunctions/Hermite.java
rename to src/main/java/org/opensourcephysics/numerics/specialfunctions/Hermite.java
diff --git a/src/org/opensourcephysics/numerics/specialfunctions/Laguerre.java b/src/main/java/org/opensourcephysics/numerics/specialfunctions/Laguerre.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/specialfunctions/Laguerre.java
rename to src/main/java/org/opensourcephysics/numerics/specialfunctions/Laguerre.java
diff --git a/src/org/opensourcephysics/numerics/specialfunctions/Legendre.java b/src/main/java/org/opensourcephysics/numerics/specialfunctions/Legendre.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/specialfunctions/Legendre.java
rename to src/main/java/org/opensourcephysics/numerics/specialfunctions/Legendre.java
diff --git a/src/org/opensourcephysics/numerics/specialfunctions/Messages.java b/src/main/java/org/opensourcephysics/numerics/specialfunctions/Messages.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/specialfunctions/Messages.java
rename to src/main/java/org/opensourcephysics/numerics/specialfunctions/Messages.java
diff --git a/src/org/opensourcephysics/numerics/specialfunctions/QNKey.java b/src/main/java/org/opensourcephysics/numerics/specialfunctions/QNKey.java
similarity index 100%
rename from src/org/opensourcephysics/numerics/specialfunctions/QNKey.java
rename to src/main/java/org/opensourcephysics/numerics/specialfunctions/QNKey.java
diff --git a/src/org/opensourcephysics/resources/controls/controls_res.java b/src/main/java/org/opensourcephysics/resources/controls/controls_res.java
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res.java
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res.java
diff --git a/src/org/opensourcephysics/resources/controls/controls_res.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_ar.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_ar.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_ar.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_ar.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_da.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_da.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_da.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_da.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_de.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_de.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_de.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_de.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_el_GR.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_el_GR.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_el_GR.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_el_GR.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_en.java b/src/main/java/org/opensourcephysics/resources/controls/controls_res_en.java
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_en.java
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_en.java
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_en.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_en.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_en.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_en.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_en_US.java b/src/main/java/org/opensourcephysics/resources/controls/controls_res_en_US.java
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_en_US.java
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_en_US.java
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_es.java b/src/main/java/org/opensourcephysics/resources/controls/controls_res_es.java
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_es.java
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_es.java
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_es.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_es.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_es.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_es.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_es_ES.java b/src/main/java/org/opensourcephysics/resources/controls/controls_res_es_ES.java
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_es_ES.java
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_es_ES.java
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_fi.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_fi.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_fi.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_fi.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_fr.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_fr.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_fr.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_fr.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_in.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_in.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_in.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_in.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_ko.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_ko.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_ko.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_ko.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_nl_NL.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_nl_NL.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_nl_NL.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_nl_NL.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_sk.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_sk.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_sk.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_sk.properties
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_zh.java b/src/main/java/org/opensourcephysics/resources/controls/controls_res_zh.java
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_zh.java
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_zh.java
diff --git a/src/org/opensourcephysics/resources/controls/controls_res_zh_TW.properties b/src/main/java/org/opensourcephysics/resources/controls/controls_res_zh_TW.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/controls_res_zh_TW.properties
rename to src/main/java/org/opensourcephysics/resources/controls/controls_res_zh_TW.properties
diff --git a/src/org/opensourcephysics/resources/controls/doctypes/osp10.dtd b/src/main/java/org/opensourcephysics/resources/controls/doctypes/osp10.dtd
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/doctypes/osp10.dtd
rename to src/main/java/org/opensourcephysics/resources/controls/doctypes/osp10.dtd
diff --git a/src/org/opensourcephysics/resources/controls/images/Thumbs.db b/src/main/java/org/opensourcephysics/resources/controls/images/Thumbs.db
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/Thumbs.db
rename to src/main/java/org/opensourcephysics/resources/controls/images/Thumbs.db
diff --git a/src/org/opensourcephysics/resources/controls/images/caution.gif b/src/main/java/org/opensourcephysics/resources/controls/images/caution.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/caution.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/caution.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/center.gif b/src/main/java/org/opensourcephysics/resources/controls/images/center.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/center.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/center.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/clear.gif b/src/main/java/org/opensourcephysics/resources/controls/images/clear.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/clear.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/clear.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/close.gif b/src/main/java/org/opensourcephysics/resources/controls/images/close.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/close.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/close.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/continue.gif b/src/main/java/org/opensourcephysics/resources/controls/images/continue.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/continue.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/continue.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/cycle.gif b/src/main/java/org/opensourcephysics/resources/controls/images/cycle.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/cycle.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/cycle.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/erase.gif b/src/main/java/org/opensourcephysics/resources/controls/images/erase.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/erase.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/erase.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/folder.gif b/src/main/java/org/opensourcephysics/resources/controls/images/folder.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/folder.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/folder.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/forward.gif b/src/main/java/org/opensourcephysics/resources/controls/images/forward.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/forward.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/forward.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/hilite.gif b/src/main/java/org/opensourcephysics/resources/controls/images/hilite.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/hilite.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/hilite.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/i_erase.gif b/src/main/java/org/opensourcephysics/resources/controls/images/i_erase.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/i_erase.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/i_erase.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/initial.gif b/src/main/java/org/opensourcephysics/resources/controls/images/initial.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/initial.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/initial.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/inspect.gif b/src/main/java/org/opensourcephysics/resources/controls/images/inspect.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/inspect.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/inspect.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/inspectfolder.gif b/src/main/java/org/opensourcephysics/resources/controls/images/inspectfolder.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/inspectfolder.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/inspectfolder.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/notime.gif b/src/main/java/org/opensourcephysics/resources/controls/images/notime.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/notime.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/notime.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/osp_icon.gif b/src/main/java/org/opensourcephysics/resources/controls/images/osp_icon.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/osp_icon.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/osp_icon.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/pause.gif b/src/main/java/org/opensourcephysics/resources/controls/images/pause.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/pause.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/pause.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/pdf.gif b/src/main/java/org/opensourcephysics/resources/controls/images/pdf.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/pdf.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/pdf.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/play.gif b/src/main/java/org/opensourcephysics/resources/controls/images/play.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/play.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/play.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/reset.gif b/src/main/java/org/opensourcephysics/resources/controls/images/reset.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/reset.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/reset.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/reset1.gif b/src/main/java/org/opensourcephysics/resources/controls/images/reset1.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/reset1.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/reset1.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/reset2.gif b/src/main/java/org/opensourcephysics/resources/controls/images/reset2.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/reset2.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/reset2.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/step.gif b/src/main/java/org/opensourcephysics/resources/controls/images/step.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/step.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/step.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/stepback.gif b/src/main/java/org/opensourcephysics/resources/controls/images/stepback.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/stepback.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/stepback.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/stepforward.gif b/src/main/java/org/opensourcephysics/resources/controls/images/stepforward.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/stepforward.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/stepforward.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/stop.gif b/src/main/java/org/opensourcephysics/resources/controls/images/stop.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/stop.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/stop.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/time.gif b/src/main/java/org/opensourcephysics/resources/controls/images/time.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/time.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/time.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/value.gif b/src/main/java/org/opensourcephysics/resources/controls/images/value.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/value.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/value.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/window.gif b/src/main/java/org/opensourcephysics/resources/controls/images/window.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/window.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/window.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/wrench.gif b/src/main/java/org/opensourcephysics/resources/controls/images/wrench.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/wrench.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/wrench.gif
diff --git a/src/org/opensourcephysics/resources/controls/images/wrench_monkey.gif b/src/main/java/org/opensourcephysics/resources/controls/images/wrench_monkey.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/controls/images/wrench_monkey.gif
rename to src/main/java/org/opensourcephysics/resources/controls/images/wrench_monkey.gif
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res.java b/src/main/java/org/opensourcephysics/resources/display/dialogs_res.java
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res.java
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res.java
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res.properties
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_da.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_da.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_da.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_da.properties
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_de.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_de.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_de.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_de.properties
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_el_GR.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_el_GR.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_el_GR.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_el_GR.properties
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_en.java b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_en.java
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_en.java
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_en.java
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_en.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_en.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_en.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_en.properties
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_en_US.java b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_en_US.java
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_en_US.java
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_en_US.java
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_es.java b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_es.java
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_es.java
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_es.java
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_es.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_es.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_es.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_es.properties
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_es_ES.java b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_es_ES.java
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_es_ES.java
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_es_ES.java
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_fi.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_fi.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_fi.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_fi.properties
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_fr.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_fr.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_fr.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_fr.properties
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_in.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_in.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_in.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_in.properties
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_ko.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_ko.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_ko.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_ko.properties
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_nl_NL.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_nl_NL.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_nl_NL.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_nl_NL.properties
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_sk.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_sk.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_sk.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_sk.properties
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_zh.java b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_zh.java
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_zh.java
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_zh.java
diff --git a/src/org/opensourcephysics/resources/display/dialogs_res_zh_TW.properties b/src/main/java/org/opensourcephysics/resources/display/dialogs_res_zh_TW.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/dialogs_res_zh_TW.properties
rename to src/main/java/org/opensourcephysics/resources/display/dialogs_res_zh_TW.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res.java b/src/main/java/org/opensourcephysics/resources/display/display_res.java
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res.java
rename to src/main/java/org/opensourcephysics/resources/display/display_res.java
diff --git a/src/org/opensourcephysics/resources/display/display_res.properties b/src/main/java/org/opensourcephysics/resources/display/display_res.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_ar.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_ar.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_ar.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_ar.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_da.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_da.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_da.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_da.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_de.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_de.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_de.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_de.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_el_GR.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_el_GR.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_el_GR.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_el_GR.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_en.java b/src/main/java/org/opensourcephysics/resources/display/display_res_en.java
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_en.java
rename to src/main/java/org/opensourcephysics/resources/display/display_res_en.java
diff --git a/src/org/opensourcephysics/resources/display/display_res_en.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_en.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_en.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_en.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_en_US.java b/src/main/java/org/opensourcephysics/resources/display/display_res_en_US.java
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_en_US.java
rename to src/main/java/org/opensourcephysics/resources/display/display_res_en_US.java
diff --git a/src/org/opensourcephysics/resources/display/display_res_en_US.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_en_US.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_en_US.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_en_US.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_es.java b/src/main/java/org/opensourcephysics/resources/display/display_res_es.java
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_es.java
rename to src/main/java/org/opensourcephysics/resources/display/display_res_es.java
diff --git a/src/org/opensourcephysics/resources/display/display_res_es.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_es.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_es.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_es.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_es_ES.java b/src/main/java/org/opensourcephysics/resources/display/display_res_es_ES.java
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_es_ES.java
rename to src/main/java/org/opensourcephysics/resources/display/display_res_es_ES.java
diff --git a/src/org/opensourcephysics/resources/display/display_res_fi.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_fi.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_fi.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_fi.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_fr.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_fr.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_fr.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_fr.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_in.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_in.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_in.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_in.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_ko.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_ko.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_ko.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_ko.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_nl_NL.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_nl_NL.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_nl_NL.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_nl_NL.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_sk.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_sk.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_sk.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_sk.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_zh.java b/src/main/java/org/opensourcephysics/resources/display/display_res_zh.java
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_zh.java
rename to src/main/java/org/opensourcephysics/resources/display/display_res_zh.java
diff --git a/src/org/opensourcephysics/resources/display/display_res_zh_CN.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_zh_CN.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_zh_CN.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_zh_CN.properties
diff --git a/src/org/opensourcephysics/resources/display/display_res_zh_TW.properties b/src/main/java/org/opensourcephysics/resources/display/display_res_zh_TW.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/display/display_res_zh_TW.properties
rename to src/main/java/org/opensourcephysics/resources/display/display_res_zh_TW.properties
diff --git a/src/org/opensourcephysics/resources/display/drawing_tools.xml b/src/main/java/org/opensourcephysics/resources/display/drawing_tools.xml
similarity index 100%
rename from src/org/opensourcephysics/resources/display/drawing_tools.xml
rename to src/main/java/org/opensourcephysics/resources/display/drawing_tools.xml
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res.java b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res.java
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res.java
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res.java
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res.properties b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res.properties
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res.properties
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_da.properties b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_da.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_da.properties
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_da.properties
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_de.properties b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_de.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_de.properties
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_de.properties
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_en.java b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_en.java
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_en.java
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_en.java
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_en.properties b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_en.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_en.properties
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_en.properties
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_en_US.java b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_en_US.java
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_en_US.java
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_en_US.java
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_en_US.properties b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_en_US.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_en_US.properties
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_en_US.properties
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_es.java b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_es.java
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_es.java
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_es.java
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_es.properties b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_es.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_es.properties
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_es.properties
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_es_ES.java b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_es_ES.java
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_es_ES.java
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_es_ES.java
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_in.properties b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_in.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_in.properties
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_in.properties
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_sk.properties b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_sk.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_sk.properties
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_sk.properties
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_zh.java b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_zh.java
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_zh.java
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_zh.java
diff --git a/src/org/opensourcephysics/resources/ejs/ejs_res_zh_TW.properties b/src/main/java/org/opensourcephysics/resources/ejs/ejs_res_zh_TW.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/ejs/ejs_res_zh_TW.properties
rename to src/main/java/org/opensourcephysics/resources/ejs/ejs_res_zh_TW.properties
diff --git a/src/org/opensourcephysics/resources/media/images/back.gif b/src/main/java/org/opensourcephysics/resources/media/images/back.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/back.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/back.gif
diff --git a/src/org/opensourcephysics/resources/media/images/back_gray.gif b/src/main/java/org/opensourcephysics/resources/media/images/back_gray.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/back_gray.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/back_gray.gif
diff --git a/src/org/opensourcephysics/resources/media/images/ccw.gif b/src/main/java/org/opensourcephysics/resources/media/images/ccw.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/ccw.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/ccw.gif
diff --git a/src/org/opensourcephysics/resources/media/images/cw.gif b/src/main/java/org/opensourcephysics/resources/media/images/cw.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/cw.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/cw.gif
diff --git a/src/org/opensourcephysics/resources/media/images/in_out.gif b/src/main/java/org/opensourcephysics/resources/media/images/in_out.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/in_out.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/in_out.gif
diff --git a/src/org/opensourcephysics/resources/media/images/looping_off.gif b/src/main/java/org/opensourcephysics/resources/media/images/looping_off.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/looping_off.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/looping_off.gif
diff --git a/src/org/opensourcephysics/resources/media/images/looping_on.gif b/src/main/java/org/opensourcephysics/resources/media/images/looping_on.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/looping_on.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/looping_on.gif
diff --git a/src/org/opensourcephysics/resources/media/images/pause.gif b/src/main/java/org/opensourcephysics/resources/media/images/pause.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/pause.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/pause.gif
diff --git a/src/org/opensourcephysics/resources/media/images/play.gif b/src/main/java/org/opensourcephysics/resources/media/images/play.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/play.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/play.gif
diff --git a/src/org/opensourcephysics/resources/media/images/play_gray.gif b/src/main/java/org/opensourcephysics/resources/media/images/play_gray.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/play_gray.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/play_gray.gif
diff --git a/src/org/opensourcephysics/resources/media/images/reset.gif b/src/main/java/org/opensourcephysics/resources/media/images/reset.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/reset.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/reset.gif
diff --git a/src/org/opensourcephysics/resources/media/images/step.gif b/src/main/java/org/opensourcephysics/resources/media/images/step.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/step.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/step.gif
diff --git a/src/org/opensourcephysics/resources/media/images/step_gray.gif b/src/main/java/org/opensourcephysics/resources/media/images/step_gray.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/step_gray.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/step_gray.gif
diff --git a/src/org/opensourcephysics/resources/media/images/video_clip.gif b/src/main/java/org/opensourcephysics/resources/media/images/video_clip.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/media/images/video_clip.gif
rename to src/main/java/org/opensourcephysics/resources/media/images/video_clip.gif
diff --git a/src/org/opensourcephysics/resources/media/video.java b/src/main/java/org/opensourcephysics/resources/media/video.java
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video.java
rename to src/main/java/org/opensourcephysics/resources/media/video.java
diff --git a/src/org/opensourcephysics/resources/media/video.properties b/src/main/java/org/opensourcephysics/resources/media/video.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video.properties
rename to src/main/java/org/opensourcephysics/resources/media/video.properties
diff --git a/src/org/opensourcephysics/resources/media/video_ar.properties b/src/main/java/org/opensourcephysics/resources/media/video_ar.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_ar.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_ar.properties
diff --git a/src/org/opensourcephysics/resources/media/video_cs.properties b/src/main/java/org/opensourcephysics/resources/media/video_cs.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_cs.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_cs.properties
diff --git a/src/org/opensourcephysics/resources/media/video_da.properties b/src/main/java/org/opensourcephysics/resources/media/video_da.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_da.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_da.properties
diff --git a/src/org/opensourcephysics/resources/media/video_de.properties b/src/main/java/org/opensourcephysics/resources/media/video_de.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_de.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_de.properties
diff --git a/src/org/opensourcephysics/resources/media/video_el_GR.properties b/src/main/java/org/opensourcephysics/resources/media/video_el_GR.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_el_GR.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_el_GR.properties
diff --git a/src/org/opensourcephysics/resources/media/video_en.java b/src/main/java/org/opensourcephysics/resources/media/video_en.java
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_en.java
rename to src/main/java/org/opensourcephysics/resources/media/video_en.java
diff --git a/src/org/opensourcephysics/resources/media/video_en.properties b/src/main/java/org/opensourcephysics/resources/media/video_en.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_en.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_en.properties
diff --git a/src/org/opensourcephysics/resources/media/video_en_US.java b/src/main/java/org/opensourcephysics/resources/media/video_en_US.java
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_en_US.java
rename to src/main/java/org/opensourcephysics/resources/media/video_en_US.java
diff --git a/src/org/opensourcephysics/resources/media/video_es.java b/src/main/java/org/opensourcephysics/resources/media/video_es.java
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_es.java
rename to src/main/java/org/opensourcephysics/resources/media/video_es.java
diff --git a/src/org/opensourcephysics/resources/media/video_es.properties b/src/main/java/org/opensourcephysics/resources/media/video_es.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_es.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_es.properties
diff --git a/src/org/opensourcephysics/resources/media/video_es_ES.java b/src/main/java/org/opensourcephysics/resources/media/video_es_ES.java
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_es_ES.java
rename to src/main/java/org/opensourcephysics/resources/media/video_es_ES.java
diff --git a/src/org/opensourcephysics/resources/media/video_fi.properties b/src/main/java/org/opensourcephysics/resources/media/video_fi.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_fi.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_fi.properties
diff --git a/src/org/opensourcephysics/resources/media/video_fr.properties b/src/main/java/org/opensourcephysics/resources/media/video_fr.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_fr.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_fr.properties
diff --git a/src/org/opensourcephysics/resources/media/video_gr.properties b/src/main/java/org/opensourcephysics/resources/media/video_gr.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_gr.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_gr.properties
diff --git a/src/org/opensourcephysics/resources/media/video_in.properties b/src/main/java/org/opensourcephysics/resources/media/video_in.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_in.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_in.properties
diff --git a/src/org/opensourcephysics/resources/media/video_it.properties b/src/main/java/org/opensourcephysics/resources/media/video_it.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_it.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_it.properties
diff --git a/src/org/opensourcephysics/resources/media/video_iw_IL.properties b/src/main/java/org/opensourcephysics/resources/media/video_iw_IL.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_iw_IL.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_iw_IL.properties
diff --git a/src/org/opensourcephysics/resources/media/video_ko.properties b/src/main/java/org/opensourcephysics/resources/media/video_ko.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_ko.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_ko.properties
diff --git a/src/org/opensourcephysics/resources/media/video_nl_NL.properties b/src/main/java/org/opensourcephysics/resources/media/video_nl_NL.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_nl_NL.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_nl_NL.properties
diff --git a/src/org/opensourcephysics/resources/media/video_pt.properties b/src/main/java/org/opensourcephysics/resources/media/video_pt.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_pt.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_pt.properties
diff --git a/src/org/opensourcephysics/resources/media/video_pt_BR.properties b/src/main/java/org/opensourcephysics/resources/media/video_pt_BR.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_pt_BR.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_pt_BR.properties
diff --git a/src/org/opensourcephysics/resources/media/video_sk.properties b/src/main/java/org/opensourcephysics/resources/media/video_sk.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_sk.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_sk.properties
diff --git a/src/org/opensourcephysics/resources/media/video_sl.properties b/src/main/java/org/opensourcephysics/resources/media/video_sl.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_sl.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_sl.properties
diff --git a/src/org/opensourcephysics/resources/media/video_sv.properties b/src/main/java/org/opensourcephysics/resources/media/video_sv.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_sv.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_sv.properties
diff --git a/src/org/opensourcephysics/resources/media/video_sw.properties b/src/main/java/org/opensourcephysics/resources/media/video_sw.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_sw.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_sw.properties
diff --git a/src/org/opensourcephysics/resources/media/video_th_TH.properties b/src/main/java/org/opensourcephysics/resources/media/video_th_TH.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_th_TH.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_th_TH.properties
diff --git a/src/org/opensourcephysics/resources/media/video_zh.java b/src/main/java/org/opensourcephysics/resources/media/video_zh.java
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_zh.java
rename to src/main/java/org/opensourcephysics/resources/media/video_zh.java
diff --git a/src/org/opensourcephysics/resources/media/video_zh_CN.properties b/src/main/java/org/opensourcephysics/resources/media/video_zh_CN.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_zh_CN.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_zh_CN.properties
diff --git a/src/org/opensourcephysics/resources/media/video_zh_TW.properties b/src/main/java/org/opensourcephysics/resources/media/video_zh_TW.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/media/video_zh_TW.properties
rename to src/main/java/org/opensourcephysics/resources/media/video_zh_TW.properties
diff --git a/src/org/opensourcephysics/resources/numerics/specialfunctions.java b/src/main/java/org/opensourcephysics/resources/numerics/specialfunctions.java
similarity index 100%
rename from src/org/opensourcephysics/resources/numerics/specialfunctions.java
rename to src/main/java/org/opensourcephysics/resources/numerics/specialfunctions.java
diff --git a/src/org/opensourcephysics/resources/numerics/specialfunctions.properties b/src/main/java/org/opensourcephysics/resources/numerics/specialfunctions.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/numerics/specialfunctions.properties
rename to src/main/java/org/opensourcephysics/resources/numerics/specialfunctions.properties
diff --git a/src/org/opensourcephysics/resources/numerics/specialfunctions_de.properties b/src/main/java/org/opensourcephysics/resources/numerics/specialfunctions_de.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/numerics/specialfunctions_de.properties
rename to src/main/java/org/opensourcephysics/resources/numerics/specialfunctions_de.properties
diff --git a/src/org/opensourcephysics/resources/numerics/specialfunctions_en.java b/src/main/java/org/opensourcephysics/resources/numerics/specialfunctions_en.java
similarity index 100%
rename from src/org/opensourcephysics/resources/numerics/specialfunctions_en.java
rename to src/main/java/org/opensourcephysics/resources/numerics/specialfunctions_en.java
diff --git a/src/org/opensourcephysics/resources/numerics/specialfunctions_en.properties b/src/main/java/org/opensourcephysics/resources/numerics/specialfunctions_en.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/numerics/specialfunctions_en.properties
rename to src/main/java/org/opensourcephysics/resources/numerics/specialfunctions_en.properties
diff --git a/src/org/opensourcephysics/resources/numerics/specialfunctions_en_US.java b/src/main/java/org/opensourcephysics/resources/numerics/specialfunctions_en_US.java
similarity index 100%
rename from src/org/opensourcephysics/resources/numerics/specialfunctions_en_US.java
rename to src/main/java/org/opensourcephysics/resources/numerics/specialfunctions_en_US.java
diff --git a/src/org/opensourcephysics/resources/numerics/specialfunctions_in.properties b/src/main/java/org/opensourcephysics/resources/numerics/specialfunctions_in.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/numerics/specialfunctions_in.properties
rename to src/main/java/org/opensourcephysics/resources/numerics/specialfunctions_in.properties
diff --git a/src/org/opensourcephysics/resources/tools/html/data_builder_help.html b/src/main/java/org/opensourcephysics/resources/tools/html/data_builder_help.html
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/html/data_builder_help.html
rename to src/main/java/org/opensourcephysics/resources/tools/html/data_builder_help.html
diff --git a/src/org/opensourcephysics/resources/tools/html/data_tool_help.html b/src/main/java/org/opensourcephysics/resources/tools/html/data_tool_help.html
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/html/data_tool_help.html
rename to src/main/java/org/opensourcephysics/resources/tools/html/data_tool_help.html
diff --git a/src/org/opensourcephysics/resources/tools/html/fit_builder_help.html b/src/main/java/org/opensourcephysics/resources/tools/html/fit_builder_help.html
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/html/fit_builder_help.html
rename to src/main/java/org/opensourcephysics/resources/tools/html/fit_builder_help.html
diff --git a/src/org/opensourcephysics/resources/tools/html/library_browser_help.html b/src/main/java/org/opensourcephysics/resources/tools/html/library_browser_help.html
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/html/library_browser_help.html
rename to src/main/java/org/opensourcephysics/resources/tools/html/library_browser_help.html
diff --git a/src/org/opensourcephysics/resources/tools/html/translator_tool_help.html b/src/main/java/org/opensourcephysics/resources/tools/html/translator_tool_help.html
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/html/translator_tool_help.html
rename to src/main/java/org/opensourcephysics/resources/tools/html/translator_tool_help.html
diff --git a/src/org/opensourcephysics/resources/tools/images/close.gif b/src/main/java/org/opensourcephysics/resources/tools/images/close.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/close.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/close.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/compadre_banner.jpg b/src/main/java/org/opensourcephysics/resources/tools/images/compadre_banner.jpg
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/compadre_banner.jpg
rename to src/main/java/org/opensourcephysics/resources/tools/images/compadre_banner.jpg
diff --git a/src/org/opensourcephysics/resources/tools/images/contract.png b/src/main/java/org/opensourcephysics/resources/tools/images/contract.png
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/contract.png
rename to src/main/java/org/opensourcephysics/resources/tools/images/contract.png
diff --git a/src/org/opensourcephysics/resources/tools/images/contract_bold.png b/src/main/java/org/opensourcephysics/resources/tools/images/contract_bold.png
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/contract_bold.png
rename to src/main/java/org/opensourcephysics/resources/tools/images/contract_bold.png
diff --git a/src/org/opensourcephysics/resources/tools/images/ejsicon.gif b/src/main/java/org/opensourcephysics/resources/tools/images/ejsicon.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/ejsicon.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/ejsicon.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/expand.png b/src/main/java/org/opensourcephysics/resources/tools/images/expand.png
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/expand.png
rename to src/main/java/org/opensourcephysics/resources/tools/images/expand.png
diff --git a/src/org/opensourcephysics/resources/tools/images/expand_bold.png b/src/main/java/org/opensourcephysics/resources/tools/images/expand_bold.png
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/expand_bold.png
rename to src/main/java/org/opensourcephysics/resources/tools/images/expand_bold.png
diff --git a/src/org/opensourcephysics/resources/tools/images/ghostfile.gif b/src/main/java/org/opensourcephysics/resources/tools/images/ghostfile.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/ghostfile.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/ghostfile.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/greenfile.gif b/src/main/java/org/opensourcephysics/resources/tools/images/greenfile.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/greenfile.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/greenfile.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/greenfolder.gif b/src/main/java/org/opensourcephysics/resources/tools/images/greenfolder.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/greenfolder.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/greenfolder.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/horzcenter.gif b/src/main/java/org/opensourcephysics/resources/tools/images/horzcenter.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/horzcenter.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/horzcenter.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/horzleft.gif b/src/main/java/org/opensourcephysics/resources/tools/images/horzleft.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/horzleft.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/horzleft.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/horzright.gif b/src/main/java/org/opensourcephysics/resources/tools/images/horzright.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/horzright.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/horzright.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/html.gif b/src/main/java/org/opensourcephysics/resources/tools/images/html.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/html.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/html.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/jarcontent.gif b/src/main/java/org/opensourcephysics/resources/tools/images/jarcontent.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/jarcontent.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/jarcontent.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/jarfile.gif b/src/main/java/org/opensourcephysics/resources/tools/images/jarfile.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/jarfile.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/jarfile.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/jarfolder.gif b/src/main/java/org/opensourcephysics/resources/tools/images/jarfolder.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/jarfolder.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/jarfolder.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/launch.gif b/src/main/java/org/opensourcephysics/resources/tools/images/launch.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/launch.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/launch.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/launchEJS.gif b/src/main/java/org/opensourcephysics/resources/tools/images/launchEJS.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/launchEJS.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/launchEJS.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/launched.gif b/src/main/java/org/opensourcephysics/resources/tools/images/launched.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/launched.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/launched.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/launchempty.gif b/src/main/java/org/opensourcephysics/resources/tools/images/launchempty.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/launchempty.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/launchempty.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/limitcursor.gif b/src/main/java/org/opensourcephysics/resources/tools/images/limitcursor.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/limitcursor.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/limitcursor.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/link.gif b/src/main/java/org/opensourcephysics/resources/tools/images/link.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/link.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/link.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/magentafile.gif b/src/main/java/org/opensourcephysics/resources/tools/images/magentafile.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/magentafile.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/magentafile.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/movecursor.gif b/src/main/java/org/opensourcephysics/resources/tools/images/movecursor.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/movecursor.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/movecursor.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/nav_closed.gif b/src/main/java/org/opensourcephysics/resources/tools/images/nav_closed.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/nav_closed.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/nav_closed.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/nav_open.gif b/src/main/java/org/opensourcephysics/resources/tools/images/nav_open.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/nav_open.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/nav_open.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/nofile.gif b/src/main/java/org/opensourcephysics/resources/tools/images/nofile.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/nofile.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/nofile.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/open.gif b/src/main/java/org/opensourcephysics/resources/tools/images/open.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/open.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/open.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/pdf.gif b/src/main/java/org/opensourcephysics/resources/tools/images/pdf.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/pdf.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/pdf.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/portrait.gif b/src/main/java/org/opensourcephysics/resources/tools/images/portrait.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/portrait.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/portrait.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/question_mark.gif b/src/main/java/org/opensourcephysics/resources/tools/images/question_mark.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/question_mark.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/question_mark.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/redfile.gif b/src/main/java/org/opensourcephysics/resources/tools/images/redfile.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/redfile.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/redfile.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/redfolder.gif b/src/main/java/org/opensourcephysics/resources/tools/images/redfolder.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/redfolder.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/redfolder.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/redo.gif b/src/main/java/org/opensourcephysics/resources/tools/images/redo.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/redo.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/redo.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/refresh.gif b/src/main/java/org/opensourcephysics/resources/tools/images/refresh.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/refresh.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/refresh.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/save.gif b/src/main/java/org/opensourcephysics/resources/tools/images/save.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/save.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/save.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/singleton.gif b/src/main/java/org/opensourcephysics/resources/tools/images/singleton.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/singleton.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/singleton.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/tracker_icon_16.png b/src/main/java/org/opensourcephysics/resources/tools/images/tracker_icon_16.png
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/tracker_icon_16.png
rename to src/main/java/org/opensourcephysics/resources/tools/images/tracker_icon_16.png
diff --git a/src/org/opensourcephysics/resources/tools/images/undo.gif b/src/main/java/org/opensourcephysics/resources/tools/images/undo.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/undo.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/undo.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/vertcenter.gif b/src/main/java/org/opensourcephysics/resources/tools/images/vertcenter.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/vertcenter.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/vertcenter.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/vertdown.gif b/src/main/java/org/opensourcephysics/resources/tools/images/vertdown.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/vertdown.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/vertdown.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/vertup.gif b/src/main/java/org/opensourcephysics/resources/tools/images/vertup.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/vertup.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/vertup.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/video.gif b/src/main/java/org/opensourcephysics/resources/tools/images/video.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/video.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/video.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/whitefile.gif b/src/main/java/org/opensourcephysics/resources/tools/images/whitefile.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/whitefile.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/whitefile.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/whitefolder.gif b/src/main/java/org/opensourcephysics/resources/tools/images/whitefolder.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/whitefolder.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/whitefolder.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/yellowfile.gif b/src/main/java/org/opensourcephysics/resources/tools/images/yellowfile.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/yellowfile.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/yellowfile.gif
diff --git a/src/org/opensourcephysics/resources/tools/images/yellowfolder.gif b/src/main/java/org/opensourcephysics/resources/tools/images/yellowfolder.gif
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/images/yellowfolder.gif
rename to src/main/java/org/opensourcephysics/resources/tools/images/yellowfolder.gif
diff --git a/src/org/opensourcephysics/resources/tools/launcher.java b/src/main/java/org/opensourcephysics/resources/tools/launcher.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher.java
rename to src/main/java/org/opensourcephysics/resources/tools/launcher.java
diff --git a/src/org/opensourcephysics/resources/tools/launcher.properties b/src/main/java/org/opensourcephysics/resources/tools/launcher.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher.properties
rename to src/main/java/org/opensourcephysics/resources/tools/launcher.properties
diff --git a/src/org/opensourcephysics/resources/tools/launcher_ar.properties b/src/main/java/org/opensourcephysics/resources/tools/launcher_ar.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_ar.properties
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_ar.properties
diff --git a/src/org/opensourcephysics/resources/tools/launcher_da.properties b/src/main/java/org/opensourcephysics/resources/tools/launcher_da.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_da.properties
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_da.properties
diff --git a/src/org/opensourcephysics/resources/tools/launcher_de.properties b/src/main/java/org/opensourcephysics/resources/tools/launcher_de.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_de.properties
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_de.properties
diff --git a/src/org/opensourcephysics/resources/tools/launcher_default.xset b/src/main/java/org/opensourcephysics/resources/tools/launcher_default.xset
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_default.xset
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_default.xset
diff --git a/src/org/opensourcephysics/resources/tools/launcher_en.java b/src/main/java/org/opensourcephysics/resources/tools/launcher_en.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_en.java
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_en.java
diff --git a/src/org/opensourcephysics/resources/tools/launcher_en.properties b/src/main/java/org/opensourcephysics/resources/tools/launcher_en.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_en.properties
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_en.properties
diff --git a/src/org/opensourcephysics/resources/tools/launcher_en_US.java b/src/main/java/org/opensourcephysics/resources/tools/launcher_en_US.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_en_US.java
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_en_US.java
diff --git a/src/org/opensourcephysics/resources/tools/launcher_es.java b/src/main/java/org/opensourcephysics/resources/tools/launcher_es.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_es.java
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_es.java
diff --git a/src/org/opensourcephysics/resources/tools/launcher_es.properties b/src/main/java/org/opensourcephysics/resources/tools/launcher_es.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_es.properties
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_es.properties
diff --git a/src/org/opensourcephysics/resources/tools/launcher_es_ES.java b/src/main/java/org/opensourcephysics/resources/tools/launcher_es_ES.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_es_ES.java
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_es_ES.java
diff --git a/src/org/opensourcephysics/resources/tools/launcher_fr.properties b/src/main/java/org/opensourcephysics/resources/tools/launcher_fr.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_fr.properties
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_fr.properties
diff --git a/src/org/opensourcephysics/resources/tools/launcher_in.properties b/src/main/java/org/opensourcephysics/resources/tools/launcher_in.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_in.properties
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_in.properties
diff --git a/src/org/opensourcephysics/resources/tools/launcher_ko.properties b/src/main/java/org/opensourcephysics/resources/tools/launcher_ko.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_ko.properties
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_ko.properties
diff --git a/src/org/opensourcephysics/resources/tools/launcher_pt.properties b/src/main/java/org/opensourcephysics/resources/tools/launcher_pt.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_pt.properties
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_pt.properties
diff --git a/src/org/opensourcephysics/resources/tools/launcher_sk.properties b/src/main/java/org/opensourcephysics/resources/tools/launcher_sk.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_sk.properties
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_sk.properties
diff --git a/src/org/opensourcephysics/resources/tools/launcher_zh.java b/src/main/java/org/opensourcephysics/resources/tools/launcher_zh.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_zh.java
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_zh.java
diff --git a/src/org/opensourcephysics/resources/tools/launcher_zh_TW.properties b/src/main/java/org/opensourcephysics/resources/tools/launcher_zh_TW.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/launcher_zh_TW.properties
rename to src/main/java/org/opensourcephysics/resources/tools/launcher_zh_TW.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools.java b/src/main/java/org/opensourcephysics/resources/tools/tools.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools.java
rename to src/main/java/org/opensourcephysics/resources/tools/tools.java
diff --git a/src/org/opensourcephysics/resources/tools/tools.properties b/src/main/java/org/opensourcephysics/resources/tools/tools.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_ar.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_ar.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_ar.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_ar.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_da.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_da.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_da.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_da.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_de.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_de.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_de.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_de.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_el_GR.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_el_GR.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_el_GR.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_el_GR.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_en.java b/src/main/java/org/opensourcephysics/resources/tools/tools_en.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_en.java
rename to src/main/java/org/opensourcephysics/resources/tools/tools_en.java
diff --git a/src/org/opensourcephysics/resources/tools/tools_en.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_en.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_en.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_en.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_en_US.java b/src/main/java/org/opensourcephysics/resources/tools/tools_en_US.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_en_US.java
rename to src/main/java/org/opensourcephysics/resources/tools/tools_en_US.java
diff --git a/src/org/opensourcephysics/resources/tools/tools_en_US.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_en_US.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_en_US.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_en_US.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_es.java b/src/main/java/org/opensourcephysics/resources/tools/tools_es.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_es.java
rename to src/main/java/org/opensourcephysics/resources/tools/tools_es.java
diff --git a/src/org/opensourcephysics/resources/tools/tools_es.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_es.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_es.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_es.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_es_ES.java b/src/main/java/org/opensourcephysics/resources/tools/tools_es_ES.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_es_ES.java
rename to src/main/java/org/opensourcephysics/resources/tools/tools_es_ES.java
diff --git a/src/org/opensourcephysics/resources/tools/tools_fi.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_fi.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_fi.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_fi.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_fr.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_fr.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_fr.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_fr.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_in.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_in.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_in.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_in.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_it.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_it.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_it.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_it.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_ko.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_ko.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_ko.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_ko.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_nl_NL.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_nl_NL.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_nl_NL.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_nl_NL.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_pt.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_pt.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_pt.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_pt.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_pt_BR.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_pt_BR.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_pt_BR.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_pt_BR.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_sk.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_sk.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_sk.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_sk.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_sl.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_sl.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_sl.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_sl.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_sv.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_sv.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_sv.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_sv.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_th_TH.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_th_TH.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_th_TH.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_th_TH.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_zh.java b/src/main/java/org/opensourcephysics/resources/tools/tools_zh.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_zh.java
rename to src/main/java/org/opensourcephysics/resources/tools/tools_zh.java
diff --git a/src/org/opensourcephysics/resources/tools/tools_zh_CN.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_zh_CN.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_zh_CN.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_zh_CN.properties
diff --git a/src/org/opensourcephysics/resources/tools/tools_zh_TW.properties b/src/main/java/org/opensourcephysics/resources/tools/tools_zh_TW.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/tools_zh_TW.properties
rename to src/main/java/org/opensourcephysics/resources/tools/tools_zh_TW.properties
diff --git a/src/org/opensourcephysics/resources/tools/xuggle.java b/src/main/java/org/opensourcephysics/resources/tools/xuggle.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/xuggle.java
rename to src/main/java/org/opensourcephysics/resources/tools/xuggle.java
diff --git a/src/org/opensourcephysics/resources/tools/xuggle.properties b/src/main/java/org/opensourcephysics/resources/tools/xuggle.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/xuggle.properties
rename to src/main/java/org/opensourcephysics/resources/tools/xuggle.properties
diff --git a/src/org/opensourcephysics/resources/tools/xuggle_en.java b/src/main/java/org/opensourcephysics/resources/tools/xuggle_en.java
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/xuggle_en.java
rename to src/main/java/org/opensourcephysics/resources/tools/xuggle_en.java
diff --git a/src/org/opensourcephysics/resources/tools/xuggle_en.properties b/src/main/java/org/opensourcephysics/resources/tools/xuggle_en.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/xuggle_en.properties
rename to src/main/java/org/opensourcephysics/resources/tools/xuggle_en.properties
diff --git a/src/org/opensourcephysics/resources/tools/xuggle_it.properties b/src/main/java/org/opensourcephysics/resources/tools/xuggle_it.properties
similarity index 100%
rename from src/org/opensourcephysics/resources/tools/xuggle_it.properties
rename to src/main/java/org/opensourcephysics/resources/tools/xuggle_it.properties
diff --git a/src/org/opensourcephysics/tools/ArrayInspector.java b/src/main/java/org/opensourcephysics/tools/ArrayInspector.java
similarity index 100%
rename from src/org/opensourcephysics/tools/ArrayInspector.java
rename to src/main/java/org/opensourcephysics/tools/ArrayInspector.java
diff --git a/src/org/opensourcephysics/tools/CheckTreeCellRenderer.java b/src/main/java/org/opensourcephysics/tools/CheckTreeCellRenderer.java
similarity index 100%
rename from src/org/opensourcephysics/tools/CheckTreeCellRenderer.java
rename to src/main/java/org/opensourcephysics/tools/CheckTreeCellRenderer.java
diff --git a/src/org/opensourcephysics/tools/CheckTreeManager.java b/src/main/java/org/opensourcephysics/tools/CheckTreeManager.java
similarity index 100%
rename from src/org/opensourcephysics/tools/CheckTreeManager.java
rename to src/main/java/org/opensourcephysics/tools/CheckTreeManager.java
diff --git a/src/org/opensourcephysics/tools/CheckTreeSelectionModel.java b/src/main/java/org/opensourcephysics/tools/CheckTreeSelectionModel.java
similarity index 100%
rename from src/org/opensourcephysics/tools/CheckTreeSelectionModel.java
rename to src/main/java/org/opensourcephysics/tools/CheckTreeSelectionModel.java
diff --git a/src/org/opensourcephysics/tools/ClipboardJob.java b/src/main/java/org/opensourcephysics/tools/ClipboardJob.java
similarity index 100%
rename from src/org/opensourcephysics/tools/ClipboardJob.java
rename to src/main/java/org/opensourcephysics/tools/ClipboardJob.java
diff --git a/src/org/opensourcephysics/tools/DataColumn.java b/src/main/java/org/opensourcephysics/tools/DataColumn.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DataColumn.java
rename to src/main/java/org/opensourcephysics/tools/DataColumn.java
diff --git a/src/org/opensourcephysics/tools/DataFunctionEditor.java b/src/main/java/org/opensourcephysics/tools/DataFunctionEditor.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DataFunctionEditor.java
rename to src/main/java/org/opensourcephysics/tools/DataFunctionEditor.java
diff --git a/src/org/opensourcephysics/tools/DataFunctionPanel.java b/src/main/java/org/opensourcephysics/tools/DataFunctionPanel.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DataFunctionPanel.java
rename to src/main/java/org/opensourcephysics/tools/DataFunctionPanel.java
diff --git a/src/org/opensourcephysics/tools/DataRefreshTool.java b/src/main/java/org/opensourcephysics/tools/DataRefreshTool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DataRefreshTool.java
rename to src/main/java/org/opensourcephysics/tools/DataRefreshTool.java
diff --git a/src/org/opensourcephysics/tools/DataTool.java b/src/main/java/org/opensourcephysics/tools/DataTool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DataTool.java
rename to src/main/java/org/opensourcephysics/tools/DataTool.java
diff --git a/src/org/opensourcephysics/tools/DataToolPropsTable.java b/src/main/java/org/opensourcephysics/tools/DataToolPropsTable.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DataToolPropsTable.java
rename to src/main/java/org/opensourcephysics/tools/DataToolPropsTable.java
diff --git a/src/org/opensourcephysics/tools/DataToolStatsTable.java b/src/main/java/org/opensourcephysics/tools/DataToolStatsTable.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DataToolStatsTable.java
rename to src/main/java/org/opensourcephysics/tools/DataToolStatsTable.java
diff --git a/src/org/opensourcephysics/tools/DataToolTab.java b/src/main/java/org/opensourcephysics/tools/DataToolTab.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DataToolTab.java
rename to src/main/java/org/opensourcephysics/tools/DataToolTab.java
diff --git a/src/org/opensourcephysics/tools/DataToolTable.java b/src/main/java/org/opensourcephysics/tools/DataToolTable.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DataToolTable.java
rename to src/main/java/org/opensourcephysics/tools/DataToolTable.java
diff --git a/src/org/opensourcephysics/tools/DatasetCurveFitter.java b/src/main/java/org/opensourcephysics/tools/DatasetCurveFitter.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DatasetCurveFitter.java
rename to src/main/java/org/opensourcephysics/tools/DatasetCurveFitter.java
diff --git a/src/org/opensourcephysics/tools/Diagnostics.java b/src/main/java/org/opensourcephysics/tools/Diagnostics.java
similarity index 100%
rename from src/org/opensourcephysics/tools/Diagnostics.java
rename to src/main/java/org/opensourcephysics/tools/Diagnostics.java
diff --git a/src/org/opensourcephysics/tools/DiagnosticsForSystem.java b/src/main/java/org/opensourcephysics/tools/DiagnosticsForSystem.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DiagnosticsForSystem.java
rename to src/main/java/org/opensourcephysics/tools/DiagnosticsForSystem.java
diff --git a/src/org/opensourcephysics/tools/DiagnosticsForThreads.java b/src/main/java/org/opensourcephysics/tools/DiagnosticsForThreads.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DiagnosticsForThreads.java
rename to src/main/java/org/opensourcephysics/tools/DiagnosticsForThreads.java
diff --git a/src/org/opensourcephysics/tools/DiagnosticsForXuggle.java b/src/main/java/org/opensourcephysics/tools/DiagnosticsForXuggle.java
similarity index 100%
rename from src/org/opensourcephysics/tools/DiagnosticsForXuggle.java
rename to src/main/java/org/opensourcephysics/tools/DiagnosticsForXuggle.java
diff --git a/src/org/opensourcephysics/tools/EjsTool.java b/src/main/java/org/opensourcephysics/tools/EjsTool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/EjsTool.java
rename to src/main/java/org/opensourcephysics/tools/EjsTool.java
diff --git a/src/org/opensourcephysics/tools/EncryptionTool.java b/src/main/java/org/opensourcephysics/tools/EncryptionTool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/EncryptionTool.java
rename to src/main/java/org/opensourcephysics/tools/EncryptionTool.java
diff --git a/src/org/opensourcephysics/tools/ExportFormat.java b/src/main/java/org/opensourcephysics/tools/ExportFormat.java
similarity index 100%
rename from src/org/opensourcephysics/tools/ExportFormat.java
rename to src/main/java/org/opensourcephysics/tools/ExportFormat.java
diff --git a/src/org/opensourcephysics/tools/ExportGnuplotFormat.java b/src/main/java/org/opensourcephysics/tools/ExportGnuplotFormat.java
similarity index 100%
rename from src/org/opensourcephysics/tools/ExportGnuplotFormat.java
rename to src/main/java/org/opensourcephysics/tools/ExportGnuplotFormat.java
diff --git a/src/org/opensourcephysics/tools/ExportTool.java b/src/main/java/org/opensourcephysics/tools/ExportTool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/ExportTool.java
rename to src/main/java/org/opensourcephysics/tools/ExportTool.java
diff --git a/src/org/opensourcephysics/tools/ExportXMLFormat.java b/src/main/java/org/opensourcephysics/tools/ExportXMLFormat.java
similarity index 100%
rename from src/org/opensourcephysics/tools/ExportXMLFormat.java
rename to src/main/java/org/opensourcephysics/tools/ExportXMLFormat.java
diff --git a/src/org/opensourcephysics/tools/ExtensionsManager.java b/src/main/java/org/opensourcephysics/tools/ExtensionsManager.java
similarity index 100%
rename from src/org/opensourcephysics/tools/ExtensionsManager.java
rename to src/main/java/org/opensourcephysics/tools/ExtensionsManager.java
diff --git a/src/org/opensourcephysics/tools/FitBuilder.java b/src/main/java/org/opensourcephysics/tools/FitBuilder.java
similarity index 100%
rename from src/org/opensourcephysics/tools/FitBuilder.java
rename to src/main/java/org/opensourcephysics/tools/FitBuilder.java
diff --git a/src/org/opensourcephysics/tools/FitFunctionPanel.java b/src/main/java/org/opensourcephysics/tools/FitFunctionPanel.java
similarity index 100%
rename from src/org/opensourcephysics/tools/FitFunctionPanel.java
rename to src/main/java/org/opensourcephysics/tools/FitFunctionPanel.java
diff --git a/src/org/opensourcephysics/tools/FontSizer.java b/src/main/java/org/opensourcephysics/tools/FontSizer.java
similarity index 100%
rename from src/org/opensourcephysics/tools/FontSizer.java
rename to src/main/java/org/opensourcephysics/tools/FontSizer.java
diff --git a/src/org/opensourcephysics/tools/FourierPanel.java b/src/main/java/org/opensourcephysics/tools/FourierPanel.java
similarity index 100%
rename from src/org/opensourcephysics/tools/FourierPanel.java
rename to src/main/java/org/opensourcephysics/tools/FourierPanel.java
diff --git a/src/org/opensourcephysics/tools/FunctionEditor.java b/src/main/java/org/opensourcephysics/tools/FunctionEditor.java
similarity index 100%
rename from src/org/opensourcephysics/tools/FunctionEditor.java
rename to src/main/java/org/opensourcephysics/tools/FunctionEditor.java
diff --git a/src/org/opensourcephysics/tools/FunctionPanel.java b/src/main/java/org/opensourcephysics/tools/FunctionPanel.java
similarity index 100%
rename from src/org/opensourcephysics/tools/FunctionPanel.java
rename to src/main/java/org/opensourcephysics/tools/FunctionPanel.java
diff --git a/src/org/opensourcephysics/tools/FunctionTool.java b/src/main/java/org/opensourcephysics/tools/FunctionTool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/FunctionTool.java
rename to src/main/java/org/opensourcephysics/tools/FunctionTool.java
diff --git a/src/org/opensourcephysics/tools/InitialValueEditor.java b/src/main/java/org/opensourcephysics/tools/InitialValueEditor.java
similarity index 100%
rename from src/org/opensourcephysics/tools/InitialValueEditor.java
rename to src/main/java/org/opensourcephysics/tools/InitialValueEditor.java
diff --git a/src/org/opensourcephysics/tools/JMultiLineToolTip.java b/src/main/java/org/opensourcephysics/tools/JMultiLineToolTip.java
similarity index 100%
rename from src/org/opensourcephysics/tools/JMultiLineToolTip.java
rename to src/main/java/org/opensourcephysics/tools/JMultiLineToolTip.java
diff --git a/src/org/opensourcephysics/tools/JarTool.java b/src/main/java/org/opensourcephysics/tools/JarTool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/JarTool.java
rename to src/main/java/org/opensourcephysics/tools/JarTool.java
diff --git a/src/org/opensourcephysics/tools/JarTreeDialog.java b/src/main/java/org/opensourcephysics/tools/JarTreeDialog.java
similarity index 100%
rename from src/org/opensourcephysics/tools/JarTreeDialog.java
rename to src/main/java/org/opensourcephysics/tools/JarTreeDialog.java
diff --git a/src/org/opensourcephysics/tools/JarTreeModel.java b/src/main/java/org/opensourcephysics/tools/JarTreeModel.java
similarity index 100%
rename from src/org/opensourcephysics/tools/JarTreeModel.java
rename to src/main/java/org/opensourcephysics/tools/JarTreeModel.java
diff --git a/src/org/opensourcephysics/tools/Job.java b/src/main/java/org/opensourcephysics/tools/Job.java
similarity index 100%
rename from src/org/opensourcephysics/tools/Job.java
rename to src/main/java/org/opensourcephysics/tools/Job.java
diff --git a/src/org/opensourcephysics/tools/JobManager.java b/src/main/java/org/opensourcephysics/tools/JobManager.java
similarity index 100%
rename from src/org/opensourcephysics/tools/JobManager.java
rename to src/main/java/org/opensourcephysics/tools/JobManager.java
diff --git a/src/org/opensourcephysics/tools/KnownFunction.java b/src/main/java/org/opensourcephysics/tools/KnownFunction.java
similarity index 100%
rename from src/org/opensourcephysics/tools/KnownFunction.java
rename to src/main/java/org/opensourcephysics/tools/KnownFunction.java
diff --git a/src/org/opensourcephysics/tools/KnownPolynomial.java b/src/main/java/org/opensourcephysics/tools/KnownPolynomial.java
similarity index 100%
rename from src/org/opensourcephysics/tools/KnownPolynomial.java
rename to src/main/java/org/opensourcephysics/tools/KnownPolynomial.java
diff --git a/src/org/opensourcephysics/tools/LaunchBuilder.java b/src/main/java/org/opensourcephysics/tools/LaunchBuilder.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LaunchBuilder.java
rename to src/main/java/org/opensourcephysics/tools/LaunchBuilder.java
diff --git a/src/org/opensourcephysics/tools/LaunchClassChooser.java b/src/main/java/org/opensourcephysics/tools/LaunchClassChooser.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LaunchClassChooser.java
rename to src/main/java/org/opensourcephysics/tools/LaunchClassChooser.java
diff --git a/src/org/opensourcephysics/tools/LaunchNode.java b/src/main/java/org/opensourcephysics/tools/LaunchNode.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LaunchNode.java
rename to src/main/java/org/opensourcephysics/tools/LaunchNode.java
diff --git a/src/org/opensourcephysics/tools/LaunchPanel.java b/src/main/java/org/opensourcephysics/tools/LaunchPanel.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LaunchPanel.java
rename to src/main/java/org/opensourcephysics/tools/LaunchPanel.java
diff --git a/src/org/opensourcephysics/tools/LaunchRes.java b/src/main/java/org/opensourcephysics/tools/LaunchRes.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LaunchRes.java
rename to src/main/java/org/opensourcephysics/tools/LaunchRes.java
diff --git a/src/org/opensourcephysics/tools/LaunchSaver.java b/src/main/java/org/opensourcephysics/tools/LaunchSaver.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LaunchSaver.java
rename to src/main/java/org/opensourcephysics/tools/LaunchSaver.java
diff --git a/src/org/opensourcephysics/tools/Launcher.java b/src/main/java/org/opensourcephysics/tools/Launcher.java
similarity index 100%
rename from src/org/opensourcephysics/tools/Launcher.java
rename to src/main/java/org/opensourcephysics/tools/Launcher.java
diff --git a/src/org/opensourcephysics/tools/LauncherUndo.java b/src/main/java/org/opensourcephysics/tools/LauncherUndo.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LauncherUndo.java
rename to src/main/java/org/opensourcephysics/tools/LauncherUndo.java
diff --git a/src/org/opensourcephysics/tools/Library.java b/src/main/java/org/opensourcephysics/tools/Library.java
similarity index 100%
rename from src/org/opensourcephysics/tools/Library.java
rename to src/main/java/org/opensourcephysics/tools/Library.java
diff --git a/src/org/opensourcephysics/tools/LibraryBrowser.java b/src/main/java/org/opensourcephysics/tools/LibraryBrowser.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LibraryBrowser.java
rename to src/main/java/org/opensourcephysics/tools/LibraryBrowser.java
diff --git a/src/org/opensourcephysics/tools/LibraryCollection.java b/src/main/java/org/opensourcephysics/tools/LibraryCollection.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LibraryCollection.java
rename to src/main/java/org/opensourcephysics/tools/LibraryCollection.java
diff --git a/src/org/opensourcephysics/tools/LibraryComPADRE.java b/src/main/java/org/opensourcephysics/tools/LibraryComPADRE.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LibraryComPADRE.java
rename to src/main/java/org/opensourcephysics/tools/LibraryComPADRE.java
diff --git a/src/org/opensourcephysics/tools/LibraryManager.java b/src/main/java/org/opensourcephysics/tools/LibraryManager.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LibraryManager.java
rename to src/main/java/org/opensourcephysics/tools/LibraryManager.java
diff --git a/src/org/opensourcephysics/tools/LibraryResource.java b/src/main/java/org/opensourcephysics/tools/LibraryResource.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LibraryResource.java
rename to src/main/java/org/opensourcephysics/tools/LibraryResource.java
diff --git a/src/org/opensourcephysics/tools/LibraryTreeNode.java b/src/main/java/org/opensourcephysics/tools/LibraryTreeNode.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LibraryTreeNode.java
rename to src/main/java/org/opensourcephysics/tools/LibraryTreeNode.java
diff --git a/src/org/opensourcephysics/tools/LibraryTreePanel.java b/src/main/java/org/opensourcephysics/tools/LibraryTreePanel.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LibraryTreePanel.java
rename to src/main/java/org/opensourcephysics/tools/LibraryTreePanel.java
diff --git a/src/org/opensourcephysics/tools/LocalJob.java b/src/main/java/org/opensourcephysics/tools/LocalJob.java
similarity index 100%
rename from src/org/opensourcephysics/tools/LocalJob.java
rename to src/main/java/org/opensourcephysics/tools/LocalJob.java
diff --git a/src/org/opensourcephysics/tools/MultiLineToolTipUI.java b/src/main/java/org/opensourcephysics/tools/MultiLineToolTipUI.java
similarity index 100%
rename from src/org/opensourcephysics/tools/MultiLineToolTipUI.java
rename to src/main/java/org/opensourcephysics/tools/MultiLineToolTipUI.java
diff --git a/src/org/opensourcephysics/tools/ParamEditor.java b/src/main/java/org/opensourcephysics/tools/ParamEditor.java
similarity index 100%
rename from src/org/opensourcephysics/tools/ParamEditor.java
rename to src/main/java/org/opensourcephysics/tools/ParamEditor.java
diff --git a/src/org/opensourcephysics/tools/Parameter.java b/src/main/java/org/opensourcephysics/tools/Parameter.java
similarity index 100%
rename from src/org/opensourcephysics/tools/Parameter.java
rename to src/main/java/org/opensourcephysics/tools/Parameter.java
diff --git a/src/org/opensourcephysics/tools/RemoteJob.java b/src/main/java/org/opensourcephysics/tools/RemoteJob.java
similarity index 100%
rename from src/org/opensourcephysics/tools/RemoteJob.java
rename to src/main/java/org/opensourcephysics/tools/RemoteJob.java
diff --git a/src/org/opensourcephysics/tools/RemoteTool.java b/src/main/java/org/opensourcephysics/tools/RemoteTool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/RemoteTool.java
rename to src/main/java/org/opensourcephysics/tools/RemoteTool.java
diff --git a/src/org/opensourcephysics/tools/Resource.java b/src/main/java/org/opensourcephysics/tools/Resource.java
similarity index 100%
rename from src/org/opensourcephysics/tools/Resource.java
rename to src/main/java/org/opensourcephysics/tools/Resource.java
diff --git a/src/org/opensourcephysics/tools/ResourceLoader.java b/src/main/java/org/opensourcephysics/tools/ResourceLoader.java
similarity index 100%
rename from src/org/opensourcephysics/tools/ResourceLoader.java
rename to src/main/java/org/opensourcephysics/tools/ResourceLoader.java
diff --git a/src/org/opensourcephysics/tools/SnapshotTool.java b/src/main/java/org/opensourcephysics/tools/SnapshotTool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/SnapshotTool.java
rename to src/main/java/org/opensourcephysics/tools/SnapshotTool.java
diff --git a/src/org/opensourcephysics/tools/Tool.java b/src/main/java/org/opensourcephysics/tools/Tool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/Tool.java
rename to src/main/java/org/opensourcephysics/tools/Tool.java
diff --git a/src/org/opensourcephysics/tools/Toolbox.java b/src/main/java/org/opensourcephysics/tools/Toolbox.java
similarity index 100%
rename from src/org/opensourcephysics/tools/Toolbox.java
rename to src/main/java/org/opensourcephysics/tools/Toolbox.java
diff --git a/src/org/opensourcephysics/tools/ToolsRes.java b/src/main/java/org/opensourcephysics/tools/ToolsRes.java
similarity index 100%
rename from src/org/opensourcephysics/tools/ToolsRes.java
rename to src/main/java/org/opensourcephysics/tools/ToolsRes.java
diff --git a/src/org/opensourcephysics/tools/Translator.java b/src/main/java/org/opensourcephysics/tools/Translator.java
similarity index 100%
rename from src/org/opensourcephysics/tools/Translator.java
rename to src/main/java/org/opensourcephysics/tools/Translator.java
diff --git a/src/org/opensourcephysics/tools/TranslatorTool.java b/src/main/java/org/opensourcephysics/tools/TranslatorTool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/TranslatorTool.java
rename to src/main/java/org/opensourcephysics/tools/TranslatorTool.java
diff --git a/src/org/opensourcephysics/tools/TristateCheckBox.java b/src/main/java/org/opensourcephysics/tools/TristateCheckBox.java
similarity index 100%
rename from src/org/opensourcephysics/tools/TristateCheckBox.java
rename to src/main/java/org/opensourcephysics/tools/TristateCheckBox.java
diff --git a/src/org/opensourcephysics/tools/UserFunction.java b/src/main/java/org/opensourcephysics/tools/UserFunction.java
similarity index 100%
rename from src/org/opensourcephysics/tools/UserFunction.java
rename to src/main/java/org/opensourcephysics/tools/UserFunction.java
diff --git a/src/org/opensourcephysics/tools/UserFunctionEditor.java b/src/main/java/org/opensourcephysics/tools/UserFunctionEditor.java
similarity index 100%
rename from src/org/opensourcephysics/tools/UserFunctionEditor.java
rename to src/main/java/org/opensourcephysics/tools/UserFunctionEditor.java
diff --git a/src/org/opensourcephysics/tools/VideoCaptureTool.java b/src/main/java/org/opensourcephysics/tools/VideoCaptureTool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/VideoCaptureTool.java
rename to src/main/java/org/opensourcephysics/tools/VideoCaptureTool.java
diff --git a/src/org/opensourcephysics/tools/VideoTool.java b/src/main/java/org/opensourcephysics/tools/VideoTool.java
similarity index 100%
rename from src/org/opensourcephysics/tools/VideoTool.java
rename to src/main/java/org/opensourcephysics/tools/VideoTool.java
diff --git a/src/org/opensourcephysics/tools/XuggleRes.java b/src/main/java/org/opensourcephysics/tools/XuggleRes.java
similarity index 100%
rename from src/org/opensourcephysics/tools/XuggleRes.java
rename to src/main/java/org/opensourcephysics/tools/XuggleRes.java
diff --git a/src/main/resources/.gitignore b/src/main/resources/.gitignore
new file mode 100644
index 00000000..b83d2226
--- /dev/null
+++ b/src/main/resources/.gitignore
@@ -0,0 +1 @@
+/target/