Merge branch 'new-name' into develop

35 files changed, 103 insertions, 70 deletions

diff --git a/src/main/java/sevenUnits/ProgramInfo.java b/src/main/java/sevenUnits/ProgramInfo.java
new file mode 100644
index 0000000..a13acd9
--- /dev/null
+++ b/src/main/java/sevenUnits/ProgramInfo.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (C) 2021 Adrien Hopkins
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package sevenUnits;
+
+/**
+ * Information about 7Units
+ * 
+ * @since 0.3.1
+ * @since 2021-06-28
+ */
+public final class ProgramInfo {
+	
+	public static final String VERSION = "0.3.0";
+	
+	private ProgramInfo() {}
+	
+}
diff --git a/src/main/java/org/unitConverter/converterGUI/DefaultPrefixRepetitionRule.java b/src/main/java/sevenUnits/converterGUI/DefaultPrefixRepetitionRule.java
index bdc3a2e..835651e 100644
--- a/src/main/java/org/unitConverter/converterGUI/DefaultPrefixRepetitionRule.java
+++ b/src/main/java/sevenUnits/converterGUI/DefaultPrefixRepetitionRule.java
@@ -1,13 +1,13 @@
 /**
  * @since 2020-08-26
  */
-package org.unitConverter.converterGUI;
+package sevenUnits.converterGUI;
 
 import java.util.List;
 import java.util.function.Predicate;
 
-import org.unitConverter.unit.SI;
-import org.unitConverter.unit.UnitPrefix;
+import sevenUnits.unit.SI;
+import sevenUnits.unit.UnitPrefix;
 
 /**
  * A rule that specifies whether prefix repetition is allowed
diff --git a/src/main/java/org/unitConverter/converterGUI/DelegateListModel.java b/src/main/java/sevenUnits/converterGUI/DelegateListModel.java
index b80f63d..dd8cc97 100644
--- a/src/main/java/org/unitConverter/converterGUI/DelegateListModel.java
+++ b/src/main/java/sevenUnits/converterGUI/DelegateListModel.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.converterGUI;
+package sevenUnits.converterGUI;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/org/unitConverter/converterGUI/FilterComparator.java b/src/main/java/sevenUnits/converterGUI/FilterComparator.java
index 9b77f21..edd00e2 100644
--- a/src/main/java/org/unitConverter/converterGUI/FilterComparator.java
+++ b/src/main/java/sevenUnits/converterGUI/FilterComparator.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.converterGUI;
+package sevenUnits.converterGUI;
 
 import java.util.Comparator;
 import java.util.Objects;
diff --git a/src/main/java/org/unitConverter/converterGUI/GridBagBuilder.java b/src/main/java/sevenUnits/converterGUI/GridBagBuilder.java
index f1229b2..0b71d78 100644
--- a/src/main/java/org/unitConverter/converterGUI/GridBagBuilder.java
+++ b/src/main/java/sevenUnits/converterGUI/GridBagBuilder.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.converterGUI;
+package sevenUnits.converterGUI;
 
 import java.awt.GridBagConstraints;
 import java.awt.Insets;
diff --git a/src/main/java/org/unitConverter/converterGUI/MutablePredicate.java b/src/main/java/sevenUnits/converterGUI/MutablePredicate.java
index e15b3cd..ae6b7a1 100644
--- a/src/main/java/org/unitConverter/converterGUI/MutablePredicate.java
+++ b/src/main/java/sevenUnits/converterGUI/MutablePredicate.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.converterGUI;
+package sevenUnits.converterGUI;
 
 import java.util.function.Predicate;
 
diff --git a/src/main/java/org/unitConverter/converterGUI/SearchBoxList.java b/src/main/java/sevenUnits/converterGUI/SearchBoxList.java
index f52d57d..2aa9fce 100644
--- a/src/main/java/org/unitConverter/converterGUI/SearchBoxList.java
+++ b/src/main/java/sevenUnits/converterGUI/SearchBoxList.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.converterGUI;
+package sevenUnits.converterGUI;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
diff --git a/src/main/java/org/unitConverter/converterGUI/UnitConverterGUI.java b/src/main/java/sevenUnits/converterGUI/SevenUnitsGUI.java
index 17ec5f9..fb498da 100644
--- a/src/main/java/org/unitConverter/converterGUI/UnitConverterGUI.java
+++ b/src/main/java/sevenUnits/converterGUI/SevenUnitsGUI.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.converterGUI;
+package sevenUnits.converterGUI;
 
 import java.awt.BorderLayout;
 import java.awt.GridBagConstraints;
@@ -64,25 +64,26 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.WindowConstants;
 import javax.swing.border.TitledBorder;
 
-import org.unitConverter.math.ConditionalExistenceCollections;
-import org.unitConverter.math.ObjectProduct;
-import org.unitConverter.unit.BaseDimension;
-import org.unitConverter.unit.BritishImperial;
-import org.unitConverter.unit.LinearUnit;
-import org.unitConverter.unit.LinearUnitValue;
-import org.unitConverter.unit.NameSymbol;
-import org.unitConverter.unit.SI;
-import org.unitConverter.unit.Unit;
-import org.unitConverter.unit.UnitDatabase;
-import org.unitConverter.unit.UnitPrefix;
-import org.unitConverter.unit.UnitValue;
+import sevenUnits.ProgramInfo;
+import sevenUnits.math.ConditionalExistenceCollections;
+import sevenUnits.math.ObjectProduct;
+import sevenUnits.unit.BaseDimension;
+import sevenUnits.unit.BritishImperial;
+import sevenUnits.unit.LinearUnit;
+import sevenUnits.unit.LinearUnitValue;
+import sevenUnits.unit.NameSymbol;
+import sevenUnits.unit.SI;
+import sevenUnits.unit.Unit;
+import sevenUnits.unit.UnitDatabase;
+import sevenUnits.unit.UnitPrefix;
+import sevenUnits.unit.UnitValue;
 
 /**
  * @author Adrien Hopkins
  * @since 2018-12-27
  * @since v0.1.0
  */
-final class UnitConverterGUI {
+final class SevenUnitsGUI {
 	/**
 	 * A tab in the View.
 	 */
@@ -162,7 +163,7 @@ final class UnitConverterGUI {
 		 * @since 2021-03-27
 		 */
 		private static final InputStream inputStream(String filepath) {
-			return UnitConverterGUI.class.getResourceAsStream(filepath);
+			return SevenUnitsGUI.class.getResourceAsStream(filepath);
 		}
 		
 		/**
@@ -844,7 +845,7 @@ final class UnitConverterGUI {
 		 */
 		public View() {
 			this.presenter = new Presenter(this);
-			this.frame = new JFrame("Unit Converter");
+			this.frame = new JFrame("7Units");
 			this.frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
 			
 			// enable system look and feel
@@ -1220,7 +1221,8 @@ final class UnitConverterGUI {
 					final String infoText = Presenter
 							.getLinesFromResource("/about.txt").stream()
 							.map(Presenter::withoutComments)
-							.collect(Collectors.joining("\n"));
+							.collect(Collectors.joining("\n"))
+							.replaceAll("\\[VERSION\\]", ProgramInfo.VERSION);
 					infoTextArea.setText(infoText);
 				}
 				
diff --git a/src/main/java/org/unitConverter/converterGUI/package-info.java b/src/main/java/sevenUnits/converterGUI/package-info.java
index d85ecab..784664f 100644
--- a/src/main/java/org/unitConverter/converterGUI/package-info.java
+++ b/src/main/java/sevenUnits/converterGUI/package-info.java
@@ -21,4 +21,4 @@
  * @since 2019-01-25
  * @since v0.2.0
  */
-package org.unitConverter.converterGUI;
\ No newline at end of file
+package sevenUnits.converterGUI;
\ No newline at end of file
diff --git a/src/main/java/org/unitConverter/math/ConditionalExistenceCollections.java b/src/main/java/sevenUnits/math/ConditionalExistenceCollections.java
index 000658b..5ce1bd7 100644
--- a/src/main/java/org/unitConverter/math/ConditionalExistenceCollections.java
+++ b/src/main/java/sevenUnits/math/ConditionalExistenceCollections.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.math;
+package sevenUnits.math;
 
 import java.util.AbstractCollection;
 import java.util.AbstractMap;
diff --git a/src/main/java/org/unitConverter/math/DecimalComparison.java b/src/main/java/sevenUnits/math/DecimalComparison.java
index 0f5b91e..24a9b2f 100644
--- a/src/main/java/org/unitConverter/math/DecimalComparison.java
+++ b/src/main/java/sevenUnits/math/DecimalComparison.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.math;
+package sevenUnits.math;
 
 import java.math.BigDecimal;
 
diff --git a/src/main/java/org/unitConverter/math/ExpressionParser.java b/src/main/java/sevenUnits/math/ExpressionParser.java
index deee51d..5c8183b 100644
--- a/src/main/java/org/unitConverter/math/ExpressionParser.java
+++ b/src/main/java/sevenUnits/math/ExpressionParser.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.math;
+package sevenUnits.math;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
diff --git a/src/main/java/org/unitConverter/math/ObjectProduct.java b/src/main/java/sevenUnits/math/ObjectProduct.java
index 5217d93..db95fd4 100644
--- a/src/main/java/org/unitConverter/math/ObjectProduct.java
+++ b/src/main/java/sevenUnits/math/ObjectProduct.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.math;
+package sevenUnits.math;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/org/unitConverter/math/UncertainDouble.java b/src/main/java/sevenUnits/math/UncertainDouble.java
index 3651bd5..b81bb79 100644
--- a/src/main/java/org/unitConverter/math/UncertainDouble.java
+++ b/src/main/java/sevenUnits/math/UncertainDouble.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.math;
+package sevenUnits.math;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
diff --git a/src/main/java/org/unitConverter/math/package-info.java b/src/main/java/sevenUnits/math/package-info.java
index 65727e4..62f72cd 100644
--- a/src/main/java/org/unitConverter/math/package-info.java
+++ b/src/main/java/sevenUnits/math/package-info.java
@@ -21,4 +21,4 @@
  * @since 2019-03-14
  * @since v0.2.0
  */
-package org.unitConverter.math;
\ No newline at end of file
+package sevenUnits.math;
\ No newline at end of file
diff --git a/src/main/java/org/unitConverter/package-info.java b/src/main/java/sevenUnits/package-info.java
index 68a258f..33b98fc 100644
--- a/src/main/java/org/unitConverter/package-info.java
+++ b/src/main/java/sevenUnits/package-info.java
@@ -21,4 +21,4 @@
  * @version v0.3.0
  * @since 2019-01-25
  */
-package org.unitConverter;
\ No newline at end of file
+package sevenUnits;
\ No newline at end of file
diff --git a/src/main/java/org/unitConverter/unit/BaseDimension.java b/src/main/java/sevenUnits/unit/BaseDimension.java
index 8e63a17..d5e98ca 100644
--- a/src/main/java/org/unitConverter/unit/BaseDimension.java
+++ b/src/main/java/sevenUnits/unit/BaseDimension.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.Objects;
 
diff --git a/src/main/java/org/unitConverter/unit/BaseUnit.java b/src/main/java/sevenUnits/unit/BaseUnit.java
index 6757bd0..b1e30fb 100644
--- a/src/main/java/org/unitConverter/unit/BaseUnit.java
+++ b/src/main/java/sevenUnits/unit/BaseUnit.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.HashSet;
 import java.util.Objects;
diff --git a/src/main/java/org/unitConverter/unit/BritishImperial.java b/src/main/java/sevenUnits/unit/BritishImperial.java
index ea23cd1..63da7f0 100644
--- a/src/main/java/org/unitConverter/unit/BritishImperial.java
+++ b/src/main/java/sevenUnits/unit/BritishImperial.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 /**
  * A static utility class that contains units in the British Imperial system.
diff --git a/src/main/java/org/unitConverter/unit/FunctionalUnit.java b/src/main/java/sevenUnits/unit/FunctionalUnit.java
index 586e0d7..7bacc9d 100644
--- a/src/main/java/org/unitConverter/unit/FunctionalUnit.java
+++ b/src/main/java/sevenUnits/unit/FunctionalUnit.java
@@ -14,12 +14,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.Objects;
 import java.util.function.DoubleUnaryOperator;
 
-import org.unitConverter.math.ObjectProduct;
+import sevenUnits.math.ObjectProduct;
 
 /**
  * A unit that uses functional objects to convert to and from its base.
diff --git a/src/main/java/org/unitConverter/unit/FunctionalUnitlike.java b/src/main/java/sevenUnits/unit/FunctionalUnitlike.java
index 21c1fca..61503e8 100644
--- a/src/main/java/org/unitConverter/unit/FunctionalUnitlike.java
+++ b/src/main/java/sevenUnits/unit/FunctionalUnitlike.java
@@ -14,12 +14,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.function.DoubleFunction;
 import java.util.function.ToDoubleFunction;
 
-import org.unitConverter.math.ObjectProduct;
+import sevenUnits.math.ObjectProduct;
 
 /**
  * A unitlike form that converts using two conversion functions.
diff --git a/src/main/java/org/unitConverter/unit/LinearUnit.java b/src/main/java/sevenUnits/unit/LinearUnit.java
index b7f33d5..7c46443 100644
--- a/src/main/java/org/unitConverter/unit/LinearUnit.java
+++ b/src/main/java/sevenUnits/unit/LinearUnit.java
@@ -14,13 +14,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.Objects;
 
-import org.unitConverter.math.DecimalComparison;
-import org.unitConverter.math.ObjectProduct;
-import org.unitConverter.math.UncertainDouble;
+import sevenUnits.math.DecimalComparison;
+import sevenUnits.math.ObjectProduct;
+import sevenUnits.math.UncertainDouble;
 
 /**
  * A unit that can be expressed as a product of its base and a number. For
diff --git a/src/main/java/org/unitConverter/unit/LinearUnitValue.java b/src/main/java/sevenUnits/unit/LinearUnitValue.java
index 8de734e..687a8b4 100644
--- a/src/main/java/org/unitConverter/unit/LinearUnitValue.java
+++ b/src/main/java/sevenUnits/unit/LinearUnitValue.java
@@ -14,13 +14,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.Objects;
 import java.util.Optional;
 
-import org.unitConverter.math.DecimalComparison;
-import org.unitConverter.math.UncertainDouble;
+import sevenUnits.math.DecimalComparison;
+import sevenUnits.math.UncertainDouble;
 
 /**
  * A possibly uncertain value expressed in a linear unit.
diff --git a/src/main/java/org/unitConverter/unit/MultiUnit.java b/src/main/java/sevenUnits/unit/MultiUnit.java
index a1623f8..014e055 100644
--- a/src/main/java/org/unitConverter/unit/MultiUnit.java
+++ b/src/main/java/sevenUnits/unit/MultiUnit.java
@@ -14,13 +14,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.unitConverter.math.ObjectProduct;
+import sevenUnits.math.ObjectProduct;
 
 /**
  * A combination of units, like "5 foot + 7 inch". All but the last units should
diff --git a/src/main/java/org/unitConverter/unit/NameSymbol.java b/src/main/java/sevenUnits/unit/NameSymbol.java
index 8d8302a..3e26138 100644
--- a/src/main/java/org/unitConverter/unit/NameSymbol.java
+++ b/src/main/java/sevenUnits/unit/NameSymbol.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/src/main/java/org/unitConverter/unit/Nameable.java b/src/main/java/sevenUnits/unit/Nameable.java
index 36740ab..ed23687 100644
--- a/src/main/java/org/unitConverter/unit/Nameable.java
+++ b/src/main/java/sevenUnits/unit/Nameable.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.Optional;
 import java.util.Set;
diff --git a/src/main/java/org/unitConverter/unit/SI.java b/src/main/java/sevenUnits/unit/SI.java
index 81736f3..e0e5a54 100644
--- a/src/main/java/org/unitConverter/unit/SI.java
+++ b/src/main/java/sevenUnits/unit/SI.java
@@ -14,11 +14,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.Set;
 
-import org.unitConverter.math.ObjectProduct;
+import sevenUnits.math.ObjectProduct;
 
 /**
  * All of the units, prefixes and dimensions that are used by the SI, as well as
diff --git a/src/main/java/org/unitConverter/unit/USCustomary.java b/src/main/java/sevenUnits/unit/USCustomary.java
index 1c4bcfe..76356c0 100644
--- a/src/main/java/org/unitConverter/unit/USCustomary.java
+++ b/src/main/java/sevenUnits/unit/USCustomary.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 /**
  * A static utility class that contains units in the US Customary system.
diff --git a/src/main/java/org/unitConverter/unit/Unit.java b/src/main/java/sevenUnits/unit/Unit.java
index 0a3298f..1e875af 100644
--- a/src/main/java/org/unitConverter/unit/Unit.java
+++ b/src/main/java/sevenUnits/unit/Unit.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -23,8 +23,8 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.function.DoubleUnaryOperator;
 
-import org.unitConverter.math.DecimalComparison;
-import org.unitConverter.math.ObjectProduct;
+import sevenUnits.math.DecimalComparison;
+import sevenUnits.math.ObjectProduct;
 
 /**
  * A unit that is composed of base units.
diff --git a/src/main/java/org/unitConverter/unit/UnitDatabase.java b/src/main/java/sevenUnits/unit/UnitDatabase.java
index 673f119..1960229 100644
--- a/src/main/java/org/unitConverter/unit/UnitDatabase.java
+++ b/src/main/java/sevenUnits/unit/UnitDatabase.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -44,11 +44,11 @@ import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.unitConverter.math.ConditionalExistenceCollections;
-import org.unitConverter.math.DecimalComparison;
-import org.unitConverter.math.ExpressionParser;
-import org.unitConverter.math.ObjectProduct;
-import org.unitConverter.math.UncertainDouble;
+import sevenUnits.math.ConditionalExistenceCollections;
+import sevenUnits.math.DecimalComparison;
+import sevenUnits.math.ExpressionParser;
+import sevenUnits.math.ObjectProduct;
+import sevenUnits.math.UncertainDouble;
 
 /**
  * A database of units, prefixes and dimensions, and their names.
diff --git a/src/main/java/org/unitConverter/unit/UnitPrefix.java b/src/main/java/sevenUnits/unit/UnitPrefix.java
index 31cc0b3..e4a27bd 100644
--- a/src/main/java/org/unitConverter/unit/UnitPrefix.java
+++ b/src/main/java/sevenUnits/unit/UnitPrefix.java
@@ -14,13 +14,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 
-import org.unitConverter.math.DecimalComparison;
+import sevenUnits.math.DecimalComparison;
 
 /**
  * A prefix that can be applied to a {@code LinearUnit} to multiply it by some value
diff --git a/src/main/java/org/unitConverter/unit/UnitValue.java b/src/main/java/sevenUnits/unit/UnitValue.java
index c138332..2fedd81 100644
--- a/src/main/java/org/unitConverter/unit/UnitValue.java
+++ b/src/main/java/sevenUnits/unit/UnitValue.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/src/main/java/org/unitConverter/unit/Unitlike.java b/src/main/java/sevenUnits/unit/Unitlike.java
index 8077771..fd361b6 100644
--- a/src/main/java/org/unitConverter/unit/Unitlike.java
+++ b/src/main/java/sevenUnits/unit/Unitlike.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,7 +22,7 @@ import java.util.Objects;
 import java.util.function.DoubleFunction;
 import java.util.function.ToDoubleFunction;
 
-import org.unitConverter.math.ObjectProduct;
+import sevenUnits.math.ObjectProduct;
 
 /**
  * An object that can convert a value between multiple forms (instances of the
diff --git a/src/main/java/org/unitConverter/unit/UnitlikeValue.java b/src/main/java/sevenUnits/unit/UnitlikeValue.java
index 79201c4..edc13ca 100644
--- a/src/main/java/org/unitConverter/unit/UnitlikeValue.java
+++ b/src/main/java/sevenUnits/unit/UnitlikeValue.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.unitConverter.unit;
+package sevenUnits.unit;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/unitConverter/unit/package-info.java b/src/main/java/sevenUnits/unit/package-info.java
index 2f0e097..6aedb9d 100644
--- a/src/main/java/org/unitConverter/unit/package-info.java
+++ b/src/main/java/sevenUnits/unit/package-info.java
@@ -21,4 +21,4 @@
  * @since 2019-10-16
  * @since v0.1.0
  */
-package org.unitConverter.unit;
\ No newline at end of file
+package sevenUnits.unit;
\ No newline at end of file