diff --git a/app/src/main/java/expr/Add.java b/app/src/main/java/expr/Add.java
index 8a68163..ec8e6fb 100644
--- a/app/src/main/java/expr/Add.java
+++ b/app/src/main/java/expr/Add.java
@@ -1,4 +1,4 @@
-package xl.expr;
+package expr;
 
 class Add extends BinaryExpr {
 
diff --git a/app/src/main/java/expr/BinaryExpr.java b/app/src/main/java/expr/BinaryExpr.java
index 85c9989..49cb462 100644
--- a/app/src/main/java/expr/BinaryExpr.java
+++ b/app/src/main/java/expr/BinaryExpr.java
@@ -1,4 +1,4 @@
-package xl.expr;
+package expr;
 
 abstract class BinaryExpr extends Expr {
 
diff --git a/app/src/main/java/expr/Div.java b/app/src/main/java/expr/Div.java
index e2b9def..b27ef43 100644
--- a/app/src/main/java/expr/Div.java
+++ b/app/src/main/java/expr/Div.java
@@ -1,6 +1,6 @@
-package xl.expr;
+package expr;
 
-import xl.util.XLException;
+import util.XLException;
 
 class Div extends BinaryExpr {
 
diff --git a/app/src/main/java/expr/Environment.java b/app/src/main/java/expr/Environment.java
index 51a43b7..eab570c 100644
--- a/app/src/main/java/expr/Environment.java
+++ b/app/src/main/java/expr/Environment.java
@@ -1,4 +1,4 @@
-package xl.expr;
+package expr;
 
 public interface Environment {
 
diff --git a/app/src/main/java/expr/Expr.java b/app/src/main/java/expr/Expr.java
index 7715418..81499f5 100644
--- a/app/src/main/java/expr/Expr.java
+++ b/app/src/main/java/expr/Expr.java
@@ -1,4 +1,4 @@
-package xl.expr;
+package expr;
 
 /**
  * An <code>Expr</code> object represents a real valued expression that may contain variables. The
diff --git a/app/src/main/java/expr/ExprParser.java b/app/src/main/java/expr/ExprParser.java
index f69465c..a933265 100644
--- a/app/src/main/java/expr/ExprParser.java
+++ b/app/src/main/java/expr/ExprParser.java
@@ -1,11 +1,11 @@
-package xl.expr;
+package expr;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StreamTokenizer;
 import java.io.StringReader;
 import java.util.regex.Pattern;
-import xl.util.XLException;
+import util.XLException;
 
 /**
  * An <code>ExprParser</code> object is a parser provides a factory method for building <code>Expr
diff --git a/app/src/main/java/expr/Mul.java b/app/src/main/java/expr/Mul.java
index 2a5cffd..b5e2f24 100644
--- a/app/src/main/java/expr/Mul.java
+++ b/app/src/main/java/expr/Mul.java
@@ -1,4 +1,4 @@
-package xl.expr;
+package expr;
 
 class Mul extends BinaryExpr {
 
diff --git a/app/src/main/java/expr/Num.java b/app/src/main/java/expr/Num.java
index 121b27f..e724043 100644
--- a/app/src/main/java/expr/Num.java
+++ b/app/src/main/java/expr/Num.java
@@ -1,6 +1,6 @@
-package xl.expr;
+package expr;
 
-import xl.util.NumberAdjustment;
+import util.NumberAdjustment;
 
 class Num extends Expr {
 
diff --git a/app/src/main/java/expr/Sub.java b/app/src/main/java/expr/Sub.java
index 7108153..80d8141 100644
--- a/app/src/main/java/expr/Sub.java
+++ b/app/src/main/java/expr/Sub.java
@@ -1,4 +1,4 @@
-package xl.expr;
+package expr;
 
 class Sub extends BinaryExpr {
 
diff --git a/app/src/main/java/expr/TestExpr.java b/app/src/main/java/expr/TestExpr.java
index e5b6b1f..62765a3 100644
--- a/app/src/main/java/expr/TestExpr.java
+++ b/app/src/main/java/expr/TestExpr.java
@@ -1,4 +1,4 @@
-package xl.expr;
+package expr;
 
 import java.io.IOException;
 
diff --git a/app/src/main/java/expr/Variable.java b/app/src/main/java/expr/Variable.java
index b8d272f..f96075e 100644
--- a/app/src/main/java/expr/Variable.java
+++ b/app/src/main/java/expr/Variable.java
@@ -1,4 +1,4 @@
-package xl.expr;
+package expr;
 
 class Variable extends Expr {
 
diff --git a/app/src/main/java/gui/BorderPanel.java b/app/src/main/java/gui/BorderPanel.java
index 002580d..85c62e0 100644
--- a/app/src/main/java/gui/BorderPanel.java
+++ b/app/src/main/java/gui/BorderPanel.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
diff --git a/app/src/main/java/gui/ColoredLabel.java b/app/src/main/java/gui/ColoredLabel.java
index 408a33f..128f63a 100644
--- a/app/src/main/java/gui/ColoredLabel.java
+++ b/app/src/main/java/gui/ColoredLabel.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import java.awt.Color;
 import javax.swing.JLabel;
diff --git a/app/src/main/java/gui/CurrentLabel.java b/app/src/main/java/gui/CurrentLabel.java
index 68a78e2..525a488 100644
--- a/app/src/main/java/gui/CurrentLabel.java
+++ b/app/src/main/java/gui/CurrentLabel.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import java.awt.Color;
 
diff --git a/app/src/main/java/gui/Editor.java b/app/src/main/java/gui/Editor.java
index 1004b4d..ae7b4d8 100644
--- a/app/src/main/java/gui/Editor.java
+++ b/app/src/main/java/gui/Editor.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import java.awt.Color;
 import javax.swing.JTextField;
diff --git a/app/src/main/java/gui/GridPanel.java b/app/src/main/java/gui/GridPanel.java
index a9ff152..b70ab60 100644
--- a/app/src/main/java/gui/GridPanel.java
+++ b/app/src/main/java/gui/GridPanel.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import java.awt.Color;
 import java.awt.GridLayout;
diff --git a/app/src/main/java/gui/RowLabels.java b/app/src/main/java/gui/RowLabels.java
index a2b909f..82a4b15 100644
--- a/app/src/main/java/gui/RowLabels.java
+++ b/app/src/main/java/gui/RowLabels.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import static java.awt.Color.LIGHT_GRAY;
 import static javax.swing.SwingConstants.RIGHT;
diff --git a/app/src/main/java/gui/SheetPanel.java b/app/src/main/java/gui/SheetPanel.java
index 74ca92d..4f777e8 100644
--- a/app/src/main/java/gui/SheetPanel.java
+++ b/app/src/main/java/gui/SheetPanel.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.WEST;
diff --git a/app/src/main/java/gui/SlotLabel.java b/app/src/main/java/gui/SlotLabel.java
index 5807b19..5f26e9b 100644
--- a/app/src/main/java/gui/SlotLabel.java
+++ b/app/src/main/java/gui/SlotLabel.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import java.awt.Color;
 
diff --git a/app/src/main/java/gui/SlotLabels.java b/app/src/main/java/gui/SlotLabels.java
index e1497d8..2423216 100644
--- a/app/src/main/java/gui/SlotLabels.java
+++ b/app/src/main/java/gui/SlotLabels.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import java.awt.Color;
 import java.util.ArrayList;
diff --git a/app/src/main/java/gui/StatusLabel.java b/app/src/main/java/gui/StatusLabel.java
index 03389eb..c902879 100644
--- a/app/src/main/java/gui/StatusLabel.java
+++ b/app/src/main/java/gui/StatusLabel.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import java.awt.Color;
 import java.util.Observable;
diff --git a/app/src/main/java/gui/StatusPanel.java b/app/src/main/java/gui/StatusPanel.java
index a6087bf..2c31617 100644
--- a/app/src/main/java/gui/StatusPanel.java
+++ b/app/src/main/java/gui/StatusPanel.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.WEST;
diff --git a/app/src/main/java/gui/XL.java b/app/src/main/java/gui/XL.java
index d4c3e69..6dc9079 100644
--- a/app/src/main/java/gui/XL.java
+++ b/app/src/main/java/gui/XL.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.NORTH;
@@ -6,7 +6,7 @@ import static java.awt.BorderLayout.SOUTH;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-import xl.gui.menu.XLMenuBar;
+import gui.menu.XLMenuBar;
 
 public class XL extends JFrame {
 
diff --git a/app/src/main/java/gui/XLCounter.java b/app/src/main/java/gui/XLCounter.java
index 7bcf68b..7bf609a 100644
--- a/app/src/main/java/gui/XLCounter.java
+++ b/app/src/main/java/gui/XLCounter.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 public class XLCounter {
 
diff --git a/app/src/main/java/gui/XLList.java b/app/src/main/java/gui/XLList.java
index 7018072..7a937ef 100644
--- a/app/src/main/java/gui/XLList.java
+++ b/app/src/main/java/gui/XLList.java
@@ -1,4 +1,4 @@
-package xl.gui;
+package gui;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/app/src/main/java/gui/menu/ClearAllMenuItem.java b/app/src/main/java/gui/menu/ClearAllMenuItem.java
index dce2215..ca9a04c 100644
--- a/app/src/main/java/gui/menu/ClearAllMenuItem.java
+++ b/app/src/main/java/gui/menu/ClearAllMenuItem.java
@@ -1,4 +1,4 @@
-package xl.gui.menu;
+package gui.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
diff --git a/app/src/main/java/gui/menu/ClearMenuItem.java b/app/src/main/java/gui/menu/ClearMenuItem.java
index c1954f9..f3e85a8 100644
--- a/app/src/main/java/gui/menu/ClearMenuItem.java
+++ b/app/src/main/java/gui/menu/ClearMenuItem.java
@@ -1,4 +1,4 @@
-package xl.gui.menu;
+package gui.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
diff --git a/app/src/main/java/gui/menu/CloseMenuItem.java b/app/src/main/java/gui/menu/CloseMenuItem.java
index 4373217..ebb1225 100644
--- a/app/src/main/java/gui/menu/CloseMenuItem.java
+++ b/app/src/main/java/gui/menu/CloseMenuItem.java
@@ -1,10 +1,10 @@
-package xl.gui.menu;
+package gui.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JMenuItem;
-import xl.gui.XL;
-import xl.gui.XLList;
+import gui.XL;
+import gui.XLList;
 
 class CloseMenuItem extends JMenuItem implements ActionListener {
 
diff --git a/app/src/main/java/gui/menu/LoadMenuItem.java b/app/src/main/java/gui/menu/LoadMenuItem.java
index c833104..a8ccfb3 100644
--- a/app/src/main/java/gui/menu/LoadMenuItem.java
+++ b/app/src/main/java/gui/menu/LoadMenuItem.java
@@ -1,9 +1,9 @@
-package xl.gui.menu;
+package gui.menu;
 
 import java.io.FileNotFoundException;
 import javax.swing.JFileChooser;
-import xl.gui.StatusLabel;
-import xl.gui.XL;
+import gui.StatusLabel;
+import gui.XL;
 
 class LoadMenuItem extends OpenMenuItem {
 
diff --git a/app/src/main/java/gui/menu/NewMenuItem.java b/app/src/main/java/gui/menu/NewMenuItem.java
index ae2aeb9..c5cc4cc 100644
--- a/app/src/main/java/gui/menu/NewMenuItem.java
+++ b/app/src/main/java/gui/menu/NewMenuItem.java
@@ -1,9 +1,9 @@
-package xl.gui.menu;
+package gui.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JMenuItem;
-import xl.gui.XL;
+import gui.XL;
 
 class NewMenuItem extends JMenuItem implements ActionListener {
 
diff --git a/app/src/main/java/gui/menu/OpenMenuItem.java b/app/src/main/java/gui/menu/OpenMenuItem.java
index 39c3f88..a3c14a5 100644
--- a/app/src/main/java/gui/menu/OpenMenuItem.java
+++ b/app/src/main/java/gui/menu/OpenMenuItem.java
@@ -1,4 +1,4 @@
-package xl.gui.menu;
+package gui.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -8,8 +8,8 @@ import javax.swing.JFileChooser;
 import javax.swing.JMenuItem;
 import javax.swing.filechooser.FileFilter;
 import javax.swing.filechooser.FileNameExtensionFilter;
-import xl.gui.StatusLabel;
-import xl.gui.XL;
+import gui.StatusLabel;
+import gui.XL;
 
 public abstract class OpenMenuItem extends JMenuItem implements ActionListener {
 
diff --git a/app/src/main/java/gui/menu/SaveMenuItem.java b/app/src/main/java/gui/menu/SaveMenuItem.java
index 84b5807..169a08e 100644
--- a/app/src/main/java/gui/menu/SaveMenuItem.java
+++ b/app/src/main/java/gui/menu/SaveMenuItem.java
@@ -1,9 +1,9 @@
-package xl.gui.menu;
+package gui.menu;
 
 import java.io.FileNotFoundException;
 import javax.swing.JFileChooser;
-import xl.gui.StatusLabel;
-import xl.gui.XL;
+import gui.StatusLabel;
+import gui.XL;
 
 class SaveMenuItem extends OpenMenuItem {
 
diff --git a/app/src/main/java/gui/menu/WindowMenu.java b/app/src/main/java/gui/menu/WindowMenu.java
index 8b5073f..2b8b375 100644
--- a/app/src/main/java/gui/menu/WindowMenu.java
+++ b/app/src/main/java/gui/menu/WindowMenu.java
@@ -1,10 +1,10 @@
-package xl.gui.menu;
+package gui.menu;
 
 import java.util.Observable;
 import java.util.Observer;
 import javax.swing.JMenu;
-import xl.gui.XL;
-import xl.gui.XLList;
+import gui.XL;
+import gui.XLList;
 
 public class WindowMenu extends JMenu implements Observer {
 
diff --git a/app/src/main/java/gui/menu/WindowMenuItem.java b/app/src/main/java/gui/menu/WindowMenuItem.java
index afa6d29..0ffd3d8 100644
--- a/app/src/main/java/gui/menu/WindowMenuItem.java
+++ b/app/src/main/java/gui/menu/WindowMenuItem.java
@@ -1,9 +1,9 @@
-package xl.gui.menu;
+package gui.menu;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JMenuItem;
-import xl.gui.XL;
+import gui.XL;
 
 class WindowMenuItem extends JMenuItem implements ActionListener {
 
diff --git a/app/src/main/java/gui/menu/XLMenuBar.java b/app/src/main/java/gui/menu/XLMenuBar.java
index cbbf837..25bed14 100644
--- a/app/src/main/java/gui/menu/XLMenuBar.java
+++ b/app/src/main/java/gui/menu/XLMenuBar.java
@@ -1,10 +1,10 @@
-package xl.gui.menu;
+package gui.menu;
 
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
-import xl.gui.StatusLabel;
-import xl.gui.XL;
-import xl.gui.XLList;
+import gui.StatusLabel;
+import gui.XL;
+import gui.XLList;
 
 public class XLMenuBar extends JMenuBar {
 
diff --git a/app/src/main/java/util/Adjustment.java b/app/src/main/java/util/Adjustment.java
index c3e6003..96b06f0 100644
--- a/app/src/main/java/util/Adjustment.java
+++ b/app/src/main/java/util/Adjustment.java
@@ -1,4 +1,4 @@
-package xl.util;
+package util;
 
 /**
  * Adjustment.java Created: Tue Oct 24 2005
diff --git a/app/src/main/java/util/NumberAdjustment.java b/app/src/main/java/util/NumberAdjustment.java
index e77b721..5e5db88 100644
--- a/app/src/main/java/util/NumberAdjustment.java
+++ b/app/src/main/java/util/NumberAdjustment.java
@@ -1,4 +1,4 @@
-package xl.util;
+package util;
 
 /**
  * NumberAdjustment.java Created: Mon OTue 24 2005
diff --git a/app/src/main/java/util/XLBufferedReader.java b/app/src/main/java/util/XLBufferedReader.java
index 34ce774..308b223 100644
--- a/app/src/main/java/util/XLBufferedReader.java
+++ b/app/src/main/java/util/XLBufferedReader.java
@@ -1,4 +1,4 @@
-package xl.util;
+package util;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
diff --git a/app/src/main/java/util/XLException.java b/app/src/main/java/util/XLException.java
index ef70535..76cb9ea 100644
--- a/app/src/main/java/util/XLException.java
+++ b/app/src/main/java/util/XLException.java
@@ -1,4 +1,4 @@
-package xl.util;
+package util;
 
 public class XLException extends RuntimeException {
 
diff --git a/app/src/main/java/util/XLPrintStream.java b/app/src/main/java/util/XLPrintStream.java
index 8ff5525..1490357 100644
--- a/app/src/main/java/util/XLPrintStream.java
+++ b/app/src/main/java/util/XLPrintStream.java
@@ -1,4 +1,4 @@
-package xl.util;
+package util;
 
 import java.io.FileNotFoundException;
 import java.io.PrintStream;