diff --git a/src/main/java/io/github/dsheirer/instrument/DemodulatorViewerFX.java b/src/main/java/io/github/dsheirer/gui/instrument/DemodulatorViewerFX.java
similarity index 98%
rename from src/main/java/io/github/dsheirer/instrument/DemodulatorViewerFX.java
rename to src/main/java/io/github/dsheirer/gui/instrument/DemodulatorViewerFX.java
index 5c21f06a..6006e65f 100644
--- a/src/main/java/io/github/dsheirer/instrument/DemodulatorViewerFX.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/DemodulatorViewerFX.java
@@ -13,9 +13,9 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument;
+package io.github.dsheirer.gui.instrument;
 
-import io.github.dsheirer.instrument.decoder.DecoderPaneFactory;
+import io.github.dsheirer.gui.instrument.decoder.DecoderPaneFactory;
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.module.decode.p25.P25Decoder;
 import javafx.application.Application;
diff --git a/src/main/java/io/github/dsheirer/instrument/PlaybackController.java b/src/main/java/io/github/dsheirer/gui/instrument/PlaybackController.java
similarity index 99%
rename from src/main/java/io/github/dsheirer/instrument/PlaybackController.java
rename to src/main/java/io/github/dsheirer/gui/instrument/PlaybackController.java
index 68029c1f..a679fafc 100644
--- a/src/main/java/io/github/dsheirer/instrument/PlaybackController.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/PlaybackController.java
@@ -13,9 +13,9 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument;
+package io.github.dsheirer.gui.instrument;
 
-import io.github.dsheirer.instrument.decoder.AbstractDecoderPane;
+import io.github.dsheirer.gui.instrument.decoder.AbstractDecoderPane;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.buffer.ReusableBuffer;
 import io.github.dsheirer.sample.buffer.ReusableBufferBroadcaster;
diff --git a/src/main/java/io/github/dsheirer/instrument/RecentFilesMenu.java b/src/main/java/io/github/dsheirer/gui/instrument/RecentFilesMenu.java
similarity index 99%
rename from src/main/java/io/github/dsheirer/instrument/RecentFilesMenu.java
rename to src/main/java/io/github/dsheirer/gui/instrument/RecentFilesMenu.java
index ea8948d3..27b7ece3 100644
--- a/src/main/java/io/github/dsheirer/instrument/RecentFilesMenu.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/RecentFilesMenu.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument;
+package io.github.dsheirer.gui.instrument;
 
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
diff --git a/src/main/java/io/github/dsheirer/instrument/ViewerDesktop.java b/src/main/java/io/github/dsheirer/gui/instrument/ViewerDesktop.java
similarity index 93%
rename from src/main/java/io/github/dsheirer/instrument/ViewerDesktop.java
rename to src/main/java/io/github/dsheirer/gui/instrument/ViewerDesktop.java
index ed372f6f..293ee6ef 100644
--- a/src/main/java/io/github/dsheirer/instrument/ViewerDesktop.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/ViewerDesktop.java
@@ -13,10 +13,10 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument;
+package io.github.dsheirer.gui.instrument;
 
-import io.github.dsheirer.instrument.decoder.AbstractDecoderPane;
-import io.github.dsheirer.instrument.decoder.DecoderPaneFactory;
+import io.github.dsheirer.gui.instrument.decoder.AbstractDecoderPane;
+import io.github.dsheirer.gui.instrument.decoder.DecoderPaneFactory;
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.module.decode.p25.P25Decoder;
 import javafx.scene.layout.BorderPane;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/AFSK1200SampleBufferChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/AFSK1200SampleBufferChart.java
similarity index 99%
rename from src/main/java/io/github/dsheirer/instrument/chart/AFSK1200SampleBufferChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/AFSK1200SampleBufferChart.java
index 49e93240..9c861dc0 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/AFSK1200SampleBufferChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/AFSK1200SampleBufferChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/AFSK1200ZeroCrossingErrorDetectorChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/AFSK1200ZeroCrossingErrorDetectorChart.java
similarity index 99%
rename from src/main/java/io/github/dsheirer/instrument/chart/AFSK1200ZeroCrossingErrorDetectorChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/AFSK1200ZeroCrossingErrorDetectorChart.java
index e90b00d9..0d2b2449 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/AFSK1200ZeroCrossingErrorDetectorChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/AFSK1200ZeroCrossingErrorDetectorChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/ComplexPhaseLineChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/ComplexPhaseLineChart.java
similarity index 98%
rename from src/main/java/io/github/dsheirer/instrument/chart/ComplexPhaseLineChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/ComplexPhaseLineChart.java
index 97a238cc..fb03391b 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/ComplexPhaseLineChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/ComplexPhaseLineChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import io.github.dsheirer.buffer.ComplexCircularBuffer;
 import io.github.dsheirer.dsp.gain.ComplexGain;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/ComplexSampleLineChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/ComplexSampleLineChart.java
similarity index 99%
rename from src/main/java/io/github/dsheirer/instrument/chart/ComplexSampleLineChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/ComplexSampleLineChart.java
index e36214a0..f567e0a6 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/ComplexSampleLineChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/ComplexSampleLineChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import io.github.dsheirer.buffer.ComplexCircularBuffer;
 import io.github.dsheirer.dsp.gain.ComplexGain;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/DecodedSymbolChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/DecodedSymbolChart.java
similarity index 98%
rename from src/main/java/io/github/dsheirer/instrument/chart/DecodedSymbolChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/DecodedSymbolChart.java
index 073169fa..3a416dfc 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/DecodedSymbolChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/DecodedSymbolChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import io.github.dsheirer.sample.Listener;
 import javafx.collections.FXCollections;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/DoubleLineChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/DoubleLineChart.java
similarity index 98%
rename from src/main/java/io/github/dsheirer/instrument/chart/DoubleLineChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/DoubleLineChart.java
index 12e0c898..cc278d8e 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/DoubleLineChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/DoubleLineChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import io.github.dsheirer.buffer.DoubleCircularBuffer;
 import io.github.dsheirer.sample.Listener;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/EyeDiagramChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/EyeDiagramChart.java
similarity index 98%
rename from src/main/java/io/github/dsheirer/instrument/chart/EyeDiagramChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/EyeDiagramChart.java
index 5cf731a6..a00db278 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/EyeDiagramChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/EyeDiagramChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import io.github.dsheirer.dsp.psk.SymbolDecisionData;
 import io.github.dsheirer.sample.Listener;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/FMDemodulatedLineChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/FMDemodulatedLineChart.java
similarity index 98%
rename from src/main/java/io/github/dsheirer/instrument/chart/FMDemodulatedLineChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/FMDemodulatedLineChart.java
index 7f44efb8..82980d9a 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/FMDemodulatedLineChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/FMDemodulatedLineChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import io.github.dsheirer.buffer.DoubleCircularBuffer;
 import io.github.dsheirer.dsp.fm.FMDemodulator;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/IInstrumentedAFSK1200Decoder.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/IInstrumentedAFSK1200Decoder.java
similarity index 96%
rename from src/main/java/io/github/dsheirer/instrument/chart/IInstrumentedAFSK1200Decoder.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/IInstrumentedAFSK1200Decoder.java
index c0e10cdb..446c6c64 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/IInstrumentedAFSK1200Decoder.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/IInstrumentedAFSK1200Decoder.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import io.github.dsheirer.dsp.afsk.AFSK1200DecoderInstrumented;
 import io.github.dsheirer.message.Message;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/LTRNetSampleBufferChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/LTRNetSampleBufferChart.java
similarity index 99%
rename from src/main/java/io/github/dsheirer/instrument/chart/LTRNetSampleBufferChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/LTRNetSampleBufferChart.java
index 7237649c..008b1824 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/LTRNetSampleBufferChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/LTRNetSampleBufferChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import io.github.dsheirer.module.decode.ltrnet.LTRNetDecoderInstrumented;
 import javafx.beans.value.ChangeListener;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/PhaseLineChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/PhaseLineChart.java
similarity index 98%
rename from src/main/java/io/github/dsheirer/instrument/chart/PhaseLineChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/PhaseLineChart.java
index 1b505f89..cdcaf2ad 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/PhaseLineChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/PhaseLineChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import io.github.dsheirer.buffer.DoubleCircularBuffer;
 import io.github.dsheirer.sample.Listener;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/RealSampleLineChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/RealSampleLineChart.java
similarity index 98%
rename from src/main/java/io/github/dsheirer/instrument/chart/RealSampleLineChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/RealSampleLineChart.java
index 9ec5210b..a914bc2a 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/RealSampleLineChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/RealSampleLineChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import io.github.dsheirer.buffer.RealCircularBuffer;
 import io.github.dsheirer.sample.Listener;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/SymbolChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/SymbolChart.java
similarity index 98%
rename from src/main/java/io/github/dsheirer/instrument/chart/SymbolChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/SymbolChart.java
index 070ca5a9..d5ea1567 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/SymbolChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/SymbolChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.complex.Complex;
diff --git a/src/main/java/io/github/dsheirer/instrument/chart/ZeroCrossingErrorDetectorChart.java b/src/main/java/io/github/dsheirer/gui/instrument/chart/ZeroCrossingErrorDetectorChart.java
similarity index 99%
rename from src/main/java/io/github/dsheirer/instrument/chart/ZeroCrossingErrorDetectorChart.java
rename to src/main/java/io/github/dsheirer/gui/instrument/chart/ZeroCrossingErrorDetectorChart.java
index 4b0ebcb6..e10147c3 100644
--- a/src/main/java/io/github/dsheirer/instrument/chart/ZeroCrossingErrorDetectorChart.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/chart/ZeroCrossingErrorDetectorChart.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.chart;
+package io.github.dsheirer.gui.instrument.chart;
 
 import io.github.dsheirer.module.decode.ltrnet.LTRNetDecoderInstrumented;
 import javafx.beans.value.ChangeListener;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/AbstractAFSK1200Pane.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/AbstractAFSK1200Pane.java
similarity index 92%
rename from src/main/java/io/github/dsheirer/instrument/decoder/AbstractAFSK1200Pane.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/AbstractAFSK1200Pane.java
index def2f899..5c9c092f 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/AbstractAFSK1200Pane.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/AbstractAFSK1200Pane.java
@@ -13,13 +13,13 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
-import io.github.dsheirer.instrument.chart.AFSK1200SampleBufferChart;
-import io.github.dsheirer.instrument.chart.AFSK1200ZeroCrossingErrorDetectorChart;
-import io.github.dsheirer.instrument.chart.DecodedSymbolChart;
-import io.github.dsheirer.instrument.chart.IInstrumentedAFSK1200Decoder;
-import io.github.dsheirer.instrument.chart.RealSampleLineChart;
+import io.github.dsheirer.gui.instrument.chart.AFSK1200SampleBufferChart;
+import io.github.dsheirer.gui.instrument.chart.AFSK1200ZeroCrossingErrorDetectorChart;
+import io.github.dsheirer.gui.instrument.chart.DecodedSymbolChart;
+import io.github.dsheirer.gui.instrument.chart.IInstrumentedAFSK1200Decoder;
+import io.github.dsheirer.gui.instrument.chart.RealSampleLineChart;
 import io.github.dsheirer.message.Message;
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.sample.Listener;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/AbstractDecoderPane.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/AbstractDecoderPane.java
similarity index 96%
rename from src/main/java/io/github/dsheirer/instrument/decoder/AbstractDecoderPane.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/AbstractDecoderPane.java
index 3770c136..64324438 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/AbstractDecoderPane.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/AbstractDecoderPane.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.SampleType;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/ComplexDecoderPane.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/ComplexDecoderPane.java
similarity index 97%
rename from src/main/java/io/github/dsheirer/instrument/decoder/ComplexDecoderPane.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/ComplexDecoderPane.java
index edbdece8..0bd39097 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/ComplexDecoderPane.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/ComplexDecoderPane.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.sample.Listener;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/DecoderPaneFactory.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/DecoderPaneFactory.java
similarity index 98%
rename from src/main/java/io/github/dsheirer/instrument/decoder/DecoderPaneFactory.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/DecoderPaneFactory.java
index 25812155..3b2c8ff0 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/DecoderPaneFactory.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/DecoderPaneFactory.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.module.decode.p25.P25Decoder;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/Fleetsync2Pane.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/Fleetsync2Pane.java
similarity index 96%
rename from src/main/java/io/github/dsheirer/instrument/decoder/Fleetsync2Pane.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/Fleetsync2Pane.java
index f7a8f5e6..d37f97fb 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/Fleetsync2Pane.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/Fleetsync2Pane.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.module.decode.fleetsync2.Fleetsync2DecoderInstrumented;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/LJ1200Pane.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/LJ1200Pane.java
similarity index 97%
rename from src/main/java/io/github/dsheirer/instrument/decoder/LJ1200Pane.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/LJ1200Pane.java
index 801331ba..b762fab1 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/LJ1200Pane.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/LJ1200Pane.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
 import io.github.dsheirer.module.decode.DecoderType;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/LTRNetPane.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/LTRNetPane.java
similarity index 94%
rename from src/main/java/io/github/dsheirer/instrument/decoder/LTRNetPane.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/LTRNetPane.java
index e0a5f15a..bf09bb33 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/LTRNetPane.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/LTRNetPane.java
@@ -13,11 +13,11 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
-import io.github.dsheirer.instrument.chart.LTRNetSampleBufferChart;
-import io.github.dsheirer.instrument.chart.RealSampleLineChart;
-import io.github.dsheirer.instrument.chart.ZeroCrossingErrorDetectorChart;
+import io.github.dsheirer.gui.instrument.chart.LTRNetSampleBufferChart;
+import io.github.dsheirer.gui.instrument.chart.RealSampleLineChart;
+import io.github.dsheirer.gui.instrument.chart.ZeroCrossingErrorDetectorChart;
 import io.github.dsheirer.message.Message;
 import io.github.dsheirer.message.MessageDirection;
 import io.github.dsheirer.module.decode.DecoderType;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/MDC1200Pane.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/MDC1200Pane.java
similarity index 97%
rename from src/main/java/io/github/dsheirer/instrument/decoder/MDC1200Pane.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/MDC1200Pane.java
index 6027eb3e..98807bfa 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/MDC1200Pane.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/MDC1200Pane.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
 import io.github.dsheirer.module.decode.DecoderType;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/MPT1327Pane.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/MPT1327Pane.java
similarity index 97%
rename from src/main/java/io/github/dsheirer/instrument/decoder/MPT1327Pane.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/MPT1327Pane.java
index 696f101b..83910f71 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/MPT1327Pane.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/MPT1327Pane.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
 import io.github.dsheirer.module.decode.DecoderType;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/P25Phase1C4FMPane.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/P25Phase1C4FMPane.java
similarity index 94%
rename from src/main/java/io/github/dsheirer/instrument/decoder/P25Phase1C4FMPane.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/P25Phase1C4FMPane.java
index 223960cb..34755d18 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/P25Phase1C4FMPane.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/P25Phase1C4FMPane.java
@@ -13,13 +13,13 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
-import io.github.dsheirer.instrument.chart.ComplexSampleLineChart;
-import io.github.dsheirer.instrument.chart.DoubleLineChart;
-import io.github.dsheirer.instrument.chart.EyeDiagramChart;
-import io.github.dsheirer.instrument.chart.PhaseLineChart;
-import io.github.dsheirer.instrument.chart.SymbolChart;
+import io.github.dsheirer.gui.instrument.chart.ComplexSampleLineChart;
+import io.github.dsheirer.gui.instrument.chart.DoubleLineChart;
+import io.github.dsheirer.gui.instrument.chart.EyeDiagramChart;
+import io.github.dsheirer.gui.instrument.chart.PhaseLineChart;
+import io.github.dsheirer.gui.instrument.chart.SymbolChart;
 import io.github.dsheirer.message.Message;
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.module.decode.p25.P25DecoderC4FMInstrumented;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/P25Phase1LSMPane.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/P25Phase1LSMPane.java
similarity index 94%
rename from src/main/java/io/github/dsheirer/instrument/decoder/P25Phase1LSMPane.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/P25Phase1LSMPane.java
index 53335842..1f96e25e 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/P25Phase1LSMPane.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/P25Phase1LSMPane.java
@@ -13,13 +13,13 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
-import io.github.dsheirer.instrument.chart.ComplexSampleLineChart;
-import io.github.dsheirer.instrument.chart.DoubleLineChart;
-import io.github.dsheirer.instrument.chart.EyeDiagramChart;
-import io.github.dsheirer.instrument.chart.PhaseLineChart;
-import io.github.dsheirer.instrument.chart.SymbolChart;
+import io.github.dsheirer.gui.instrument.chart.ComplexSampleLineChart;
+import io.github.dsheirer.gui.instrument.chart.DoubleLineChart;
+import io.github.dsheirer.gui.instrument.chart.EyeDiagramChart;
+import io.github.dsheirer.gui.instrument.chart.PhaseLineChart;
+import io.github.dsheirer.gui.instrument.chart.SymbolChart;
 import io.github.dsheirer.message.Message;
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.module.decode.p25.P25DecoderLSMInstrumented;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/RealDecoderPane.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/RealDecoderPane.java
similarity index 97%
rename from src/main/java/io/github/dsheirer/instrument/decoder/RealDecoderPane.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/RealDecoderPane.java
index 3853c36c..afc05786 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/RealDecoderPane.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/RealDecoderPane.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.sample.Listener;
diff --git a/src/main/java/io/github/dsheirer/instrument/decoder/Tait1200Pane.java b/src/main/java/io/github/dsheirer/gui/instrument/decoder/Tait1200Pane.java
similarity index 97%
rename from src/main/java/io/github/dsheirer/instrument/decoder/Tait1200Pane.java
rename to src/main/java/io/github/dsheirer/gui/instrument/decoder/Tait1200Pane.java
index 75cfb35e..9b8b997e 100644
--- a/src/main/java/io/github/dsheirer/instrument/decoder/Tait1200Pane.java
+++ b/src/main/java/io/github/dsheirer/gui/instrument/decoder/Tait1200Pane.java
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>
  *
  ******************************************************************************/
-package io.github.dsheirer.instrument.decoder;
+package io.github.dsheirer.gui.instrument.decoder;
 
 import io.github.dsheirer.dsp.symbol.ISyncDetectListener;
 import io.github.dsheirer.module.decode.DecoderType;
diff --git a/src/main/java/io/github/dsheirer/module/decode/fleetsync2/Fleetsync2DecoderInstrumented.java b/src/main/java/io/github/dsheirer/module/decode/fleetsync2/Fleetsync2DecoderInstrumented.java
index 88abbfeb..481c2f26 100644
--- a/src/main/java/io/github/dsheirer/module/decode/fleetsync2/Fleetsync2DecoderInstrumented.java
+++ b/src/main/java/io/github/dsheirer/module/decode/fleetsync2/Fleetsync2DecoderInstrumented.java
@@ -16,7 +16,7 @@
 package io.github.dsheirer.module.decode.fleetsync2;
 
 import io.github.dsheirer.dsp.afsk.AFSK1200DecoderInstrumented;
-import io.github.dsheirer.instrument.chart.IInstrumentedAFSK1200Decoder;
+import io.github.dsheirer.gui.instrument.chart.IInstrumentedAFSK1200Decoder;
 import io.github.dsheirer.sample.buffer.ReusableBuffer;
 import javafx.beans.property.SimpleIntegerProperty;
 
diff --git a/src/main/java/io/github/dsheirer/module/decode/lj1200/LJ1200DecoderInstrumented.java b/src/main/java/io/github/dsheirer/module/decode/lj1200/LJ1200DecoderInstrumented.java
index 80648fb2..b86661ee 100644
--- a/src/main/java/io/github/dsheirer/module/decode/lj1200/LJ1200DecoderInstrumented.java
+++ b/src/main/java/io/github/dsheirer/module/decode/lj1200/LJ1200DecoderInstrumented.java
@@ -16,7 +16,7 @@
 package io.github.dsheirer.module.decode.lj1200;
 
 import io.github.dsheirer.dsp.afsk.AFSK1200DecoderInstrumented;
-import io.github.dsheirer.instrument.chart.IInstrumentedAFSK1200Decoder;
+import io.github.dsheirer.gui.instrument.chart.IInstrumentedAFSK1200Decoder;
 import io.github.dsheirer.sample.buffer.ReusableBuffer;
 import javafx.beans.property.SimpleIntegerProperty;
 
diff --git a/src/main/java/io/github/dsheirer/module/decode/mdc1200/MDCDecoderInstrumented.java b/src/main/java/io/github/dsheirer/module/decode/mdc1200/MDCDecoderInstrumented.java
index c430b999..a3b90632 100644
--- a/src/main/java/io/github/dsheirer/module/decode/mdc1200/MDCDecoderInstrumented.java
+++ b/src/main/java/io/github/dsheirer/module/decode/mdc1200/MDCDecoderInstrumented.java
@@ -16,7 +16,7 @@
 package io.github.dsheirer.module.decode.mdc1200;
 
 import io.github.dsheirer.dsp.afsk.AFSK1200DecoderInstrumented;
-import io.github.dsheirer.instrument.chart.IInstrumentedAFSK1200Decoder;
+import io.github.dsheirer.gui.instrument.chart.IInstrumentedAFSK1200Decoder;
 import io.github.dsheirer.sample.buffer.ReusableBuffer;
 import javafx.beans.property.SimpleIntegerProperty;
 
diff --git a/src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327DecoderInstrumented.java b/src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327DecoderInstrumented.java
index 365ff66b..8ef42fce 100644
--- a/src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327DecoderInstrumented.java
+++ b/src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327DecoderInstrumented.java
@@ -16,7 +16,7 @@
 package io.github.dsheirer.module.decode.mpt1327;
 
 import io.github.dsheirer.dsp.afsk.AFSK1200DecoderInstrumented;
-import io.github.dsheirer.instrument.chart.IInstrumentedAFSK1200Decoder;
+import io.github.dsheirer.gui.instrument.chart.IInstrumentedAFSK1200Decoder;
 import io.github.dsheirer.sample.buffer.ReusableBuffer;
 import javafx.beans.property.SimpleIntegerProperty;
 
diff --git a/src/main/java/io/github/dsheirer/module/decode/tait/Tait1200DecoderInstrumented.java b/src/main/java/io/github/dsheirer/module/decode/tait/Tait1200DecoderInstrumented.java
index 93150c67..b4f7eab4 100644
--- a/src/main/java/io/github/dsheirer/module/decode/tait/Tait1200DecoderInstrumented.java
+++ b/src/main/java/io/github/dsheirer/module/decode/tait/Tait1200DecoderInstrumented.java
@@ -16,7 +16,7 @@
 package io.github.dsheirer.module.decode.tait;
 
 import io.github.dsheirer.dsp.afsk.AFSK1200DecoderInstrumented;
-import io.github.dsheirer.instrument.chart.IInstrumentedAFSK1200Decoder;
+import io.github.dsheirer.gui.instrument.chart.IInstrumentedAFSK1200Decoder;
 import io.github.dsheirer.sample.buffer.ReusableBuffer;
 import javafx.beans.property.SimpleIntegerProperty;