Merge branch 'develop'

35 files changed, 205 insertions, 175 deletions

diff --git a/src/main/java/sevenUnits/ProgramInfo.java b/src/main/java/sevenUnits/ProgramInfo.java
new file mode 100644
index 0000000..2a0edde
--- /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.1";
+	
+	private ProgramInfo() {}
+	
+}
diff --git a/src/main/java/org/unitConverter/converterGUI/DefaultPrefixRepetitionRule.java b/src/main/java/sevenUnits/converterGUI/DefaultPrefixRepetitionRule.java
index bdc3a2e..6b6abf0 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.Metric;
+import sevenUnits.unit.UnitPrefix;
 
 /**
  * A rule that specifies whether prefix repetition is allowed
@@ -49,7 +49,7 @@ enum DefaultPrefixRepetitionRule implements Predicate<List<UnitPrefix>> {
 			// if the first prefix is non-metric (including binary prefixes),
 			// assume we are using non-metric prefixes
 			// non-metric prefixes are allowed, but can't be repeated.
-			if (!SI.DECIMAL_PREFIXES.contains(prefixes.get(0)))
+			if (!Metric.DECIMAL_PREFIXES.contains(prefixes.get(0)))
 				return NO_REPETITION.test(prefixes);
 			
 			int part = 0; // 0=yotta/yoctos, 1=kilo-zetta/milli-zepto,
@@ -58,7 +58,7 @@ enum DefaultPrefixRepetitionRule implements Predicate<List<UnitPrefix>> {
 			for (final UnitPrefix prefix : prefixes) {
 				// check that the current prefix is metric and appropriately
 				// magnifying/reducing
-				if (!SI.DECIMAL_PREFIXES.contains(prefix))
+				if (!Metric.DECIMAL_PREFIXES.contains(prefix))
 					return false;
 				if (magnifying != prefix.getMultiplier() > 1)
 					return false;
@@ -72,7 +72,7 @@ enum DefaultPrefixRepetitionRule implements Predicate<List<UnitPrefix>> {
 					break;
 				case 1:
 					// after a kilo-zetta, only deka/hecto are valid
-					if (SI.THOUSAND_PREFIXES.contains(prefix))
+					if (Metric.THOUSAND_PREFIXES.contains(prefix))
 						return false;
 					break;
 				case 2:
@@ -81,9 +81,9 @@ enum DefaultPrefixRepetitionRule implements Predicate<List<UnitPrefix>> {
 				}
 				
 				// set part
-				if (SI.YOTTA.equals(prefix) || SI.YOCTO.equals(prefix)) {
+				if (Metric.YOTTA.equals(prefix) || Metric.YOCTO.equals(prefix)) {
 					part = 0;
-				} else if (SI.THOUSAND_PREFIXES.contains(prefix)) {
+				} else if (Metric.THOUSAND_PREFIXES.contains(prefix)) {
 					part = 1;
 				} else {
 					part = 2;
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..bfd5974 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.unit.BaseDimension;
+import sevenUnits.unit.BritishImperial;
+import sevenUnits.unit.LinearUnit;
+import sevenUnits.unit.LinearUnitValue;
+import sevenUnits.unit.NameSymbol;
+import sevenUnits.unit.Metric;
+import sevenUnits.unit.Unit;
+import sevenUnits.unit.UnitDatabase;
+import sevenUnits.unit.UnitPrefix;
+import sevenUnits.unit.UnitValue;
+import sevenUnits.utils.ConditionalExistenceCollections;
+import sevenUnits.utils.ObjectProduct;
 
 /**
  * @author Adrien Hopkins
  * @since 2018-12-27
  * @since v0.1.0
  */
-final class UnitConverterGUI {
+final class SevenUnitsGUI {
 	/**
 	 * A tab in the View.
 	 */
@@ -109,25 +110,25 @@ final class UnitConverterGUI {
 		 * @since v0.2.0
 		 */
 		private static void addDefaults(final UnitDatabase database) {
-			database.addUnit("metre", SI.METRE);
-			database.addUnit("kilogram", SI.KILOGRAM);
-			database.addUnit("gram", SI.KILOGRAM.dividedBy(1000));
-			database.addUnit("second", SI.SECOND);
-			database.addUnit("ampere", SI.AMPERE);
-			database.addUnit("kelvin", SI.KELVIN);
-			database.addUnit("mole", SI.MOLE);
-			database.addUnit("candela", SI.CANDELA);
-			database.addUnit("bit", SI.BIT);
-			database.addUnit("unit", SI.ONE);
+			database.addUnit("metre", Metric.METRE);
+			database.addUnit("kilogram", Metric.KILOGRAM);
+			database.addUnit("gram", Metric.KILOGRAM.dividedBy(1000));
+			database.addUnit("second", Metric.SECOND);
+			database.addUnit("ampere", Metric.AMPERE);
+			database.addUnit("kelvin", Metric.KELVIN);
+			database.addUnit("mole", Metric.MOLE);
+			database.addUnit("candela", Metric.CANDELA);
+			database.addUnit("bit", Metric.BIT);
+			database.addUnit("unit", Metric.ONE);
 			// nonlinear units - must be loaded manually
-			database.addUnit("tempCelsius", SI.CELSIUS);
+			database.addUnit("tempCelsius", Metric.CELSIUS);
 			database.addUnit("tempFahrenheit", BritishImperial.FAHRENHEIT);
 			
 			// load initial dimensions
-			database.addDimension("LENGTH", SI.Dimensions.LENGTH);
-			database.addDimension("MASS", SI.Dimensions.MASS);
-			database.addDimension("TIME", SI.Dimensions.TIME);
-			database.addDimension("TEMPERATURE", SI.Dimensions.TEMPERATURE);
+			database.addDimension("LENGTH", Metric.Dimensions.LENGTH);
+			database.addDimension("MASS", Metric.Dimensions.MASS);
+			database.addDimension("TIME", Metric.Dimensions.TIME);
+			database.addDimension("TEMPERATURE", Metric.Dimensions.TEMPERATURE);
 		}
 		
 		/**
@@ -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/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..ee2c277 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;
@@ -75,7 +75,7 @@ public final class BaseUnit extends Unit {
 	 */
 	private BaseUnit(final BaseDimension dimension, final String primaryName,
 			final String symbol, final Set<String> otherNames) {
-		super(primaryName, symbol, otherNames);
+		super(NameSymbol.of(primaryName, symbol, otherNames));
 		this.dimension = Objects.requireNonNull(dimension,
 				"dimension must not be null.");
 	}
diff --git a/src/main/java/org/unitConverter/unit/BritishImperial.java b/src/main/java/sevenUnits/unit/BritishImperial.java
index ea23cd1..81a3f2a 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.
@@ -48,7 +48,7 @@ public final class BritishImperial {
 		/**
 		 * According to the International Yard and Pound of 1959, a yard is defined as exactly 0.9144 metres.
 		 */
-		public static final LinearUnit YARD = SI.METRE.times(0.9144);
+		public static final LinearUnit YARD = Metric.METRE.times(0.9144);
 		public static final LinearUnit FOOT = YARD.dividedBy(3);
 		public static final LinearUnit INCH = FOOT.dividedBy(12);
 		public static final LinearUnit THOU = INCH.dividedBy(1000);
@@ -57,7 +57,7 @@ public final class BritishImperial {
 		public static final LinearUnit MILE = FURLONG.times(8);
 		public static final LinearUnit LEAGUE = MILE.times(3);
 
-		public static final LinearUnit NAUTICAL_MILE = SI.METRE.times(1852);
+		public static final LinearUnit NAUTICAL_MILE = Metric.METRE.times(1852);
 		public static final LinearUnit CABLE = NAUTICAL_MILE.dividedBy(10);
 		public static final LinearUnit FATHOM = CABLE.dividedBy(100);
 
@@ -72,7 +72,7 @@ public final class BritishImperial {
 	 * @since 2019-11-08
 	 */
 	public static final class Mass {
-		public static final LinearUnit POUND = SI.GRAM.times(453.59237);
+		public static final LinearUnit POUND = Metric.GRAM.times(453.59237);
 		public static final LinearUnit OUNCE = POUND.dividedBy(16);
 		public static final LinearUnit DRACHM = POUND.dividedBy(256);
 		public static final LinearUnit GRAIN = POUND.dividedBy(7000);
@@ -80,7 +80,7 @@ public final class BritishImperial {
 		public static final LinearUnit QUARTER = STONE.times(2);
 		public static final LinearUnit HUNDREDWEIGHT = QUARTER.times(4);
 		public static final LinearUnit LONG_TON = HUNDREDWEIGHT.times(20);
-		public static final LinearUnit SLUG = SI.KILOGRAM.times(14.59390294);
+		public static final LinearUnit SLUG = Metric.KILOGRAM.times(14.59390294);
 	}
 
 	/**
@@ -90,7 +90,7 @@ public final class BritishImperial {
 	 * @since 2019-11-08
 	 */
 	public static final class Volume {
-		public static final LinearUnit FLUID_OUNCE = SI.LITRE.withPrefix(SI.MILLI).times(28.4130625);
+		public static final LinearUnit FLUID_OUNCE = Metric.LITRE.withPrefix(Metric.MILLI).times(28.4130625);
 		public static final LinearUnit GILL = FLUID_OUNCE.times(5);
 		public static final LinearUnit PINT = FLUID_OUNCE.times(20);
 		public static final LinearUnit QUART = PINT.times(2);
@@ -104,13 +104,13 @@ public final class BritishImperial {
 		public static final LinearUnit ACRE_FOOT = Area.ACRE.times(Length.FOOT);
 	}
 
-	public static final LinearUnit OUNCE_FORCE = Mass.OUNCE.times(SI.Constants.EARTH_GRAVITY);
-	public static final LinearUnit POUND_FORCE = Mass.POUND.times(SI.Constants.EARTH_GRAVITY);
+	public static final LinearUnit OUNCE_FORCE = Mass.OUNCE.times(Metric.Constants.EARTH_GRAVITY);
+	public static final LinearUnit POUND_FORCE = Mass.POUND.times(Metric.Constants.EARTH_GRAVITY);
 
-	public static final LinearUnit BRITISH_THERMAL_UNIT = SI.JOULE.times(1055.06);
-	public static final LinearUnit CALORIE = SI.JOULE.times(4.184);
-	public static final LinearUnit KILOCALORIE = SI.JOULE.times(4184);
+	public static final LinearUnit BRITISH_THERMAL_UNIT = Metric.JOULE.times(1055.06);
+	public static final LinearUnit CALORIE = Metric.JOULE.times(4.184);
+	public static final LinearUnit KILOCALORIE = Metric.JOULE.times(4184);
 
-	public static final Unit FAHRENHEIT = Unit.fromConversionFunctions(SI.KELVIN.getBase(),
+	public static final Unit FAHRENHEIT = Unit.fromConversionFunctions(Metric.KELVIN.getBase(),
 			tempK -> tempK * 1.8 - 459.67, tempF -> (tempF + 459.67) / 1.8);
 }
diff --git a/src/main/java/org/unitConverter/unit/FunctionalUnit.java b/src/main/java/sevenUnits/unit/FunctionalUnit.java
index 586e0d7..df457e4 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.utils.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..2ee9e19 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.utils.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..25c2e2e 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.utils.DecimalComparison;
+import sevenUnits.utils.ObjectProduct;
+import sevenUnits.utils.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..a36d568 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.utils.DecimalComparison;
+import sevenUnits.utils.UncertainDouble;
 
 /**
  * A possibly uncertain value expressed in a linear unit.
@@ -32,7 +32,7 @@ import org.unitConverter.math.UncertainDouble;
  * @since 2020-07-26
  */
 public final class LinearUnitValue {
-	public static final LinearUnitValue ONE = getExact(SI.ONE, 1);
+	public static final LinearUnitValue ONE = getExact(Metric.ONE, 1);
 	
 	/**
 	 * Gets an exact {@code LinearUnitValue}
diff --git a/src/main/java/org/unitConverter/unit/SI.java b/src/main/java/sevenUnits/unit/Metric.java
index 81736f3..3c4d291 100644
--- a/src/main/java/org/unitConverter/unit/SI.java
+++ b/src/main/java/sevenUnits/unit/Metric.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.utils.ObjectProduct;
 
 /**
  * All of the units, prefixes and dimensions that are used by the SI, as well as
@@ -36,7 +36,7 @@ import org.unitConverter.math.ObjectProduct;
  * @author Adrien Hopkins
  * @since 2019-10-16
  */
-public final class SI {
+public final class Metric {
 	/// dimensions used by SI units
 	// base dimensions, as BaseDimensions
 	public static final class BaseDimensions {
@@ -402,57 +402,57 @@ public final class SI {
 			.withName(NameSymbol.of("exbi", "Ei"));
 	
 	// a few prefixed units
-	public static final LinearUnit MICROMETRE = SI.METRE.withPrefix(SI.MICRO);
-	public static final LinearUnit MILLIMETRE = SI.METRE.withPrefix(SI.MILLI);
-	public static final LinearUnit KILOMETRE = SI.METRE.withPrefix(SI.KILO);
-	public static final LinearUnit MEGAMETRE = SI.METRE.withPrefix(SI.MEGA);
+	public static final LinearUnit MICROMETRE = Metric.METRE.withPrefix(Metric.MICRO);
+	public static final LinearUnit MILLIMETRE = Metric.METRE.withPrefix(Metric.MILLI);
+	public static final LinearUnit KILOMETRE = Metric.METRE.withPrefix(Metric.KILO);
+	public static final LinearUnit MEGAMETRE = Metric.METRE.withPrefix(Metric.MEGA);
 	
-	public static final LinearUnit MICROLITRE = SI.LITRE.withPrefix(SI.MICRO);
-	public static final LinearUnit MILLILITRE = SI.LITRE.withPrefix(SI.MILLI);
-	public static final LinearUnit KILOLITRE = SI.LITRE.withPrefix(SI.KILO);
-	public static final LinearUnit MEGALITRE = SI.LITRE.withPrefix(SI.MEGA);
+	public static final LinearUnit MICROLITRE = Metric.LITRE.withPrefix(Metric.MICRO);
+	public static final LinearUnit MILLILITRE = Metric.LITRE.withPrefix(Metric.MILLI);
+	public static final LinearUnit KILOLITRE = Metric.LITRE.withPrefix(Metric.KILO);
+	public static final LinearUnit MEGALITRE = Metric.LITRE.withPrefix(Metric.MEGA);
 	
-	public static final LinearUnit MICROSECOND = SI.SECOND.withPrefix(SI.MICRO);
-	public static final LinearUnit MILLISECOND = SI.SECOND.withPrefix(SI.MILLI);
-	public static final LinearUnit KILOSECOND = SI.SECOND.withPrefix(SI.KILO);
-	public static final LinearUnit MEGASECOND = SI.SECOND.withPrefix(SI.MEGA);
+	public static final LinearUnit MICROSECOND = Metric.SECOND.withPrefix(Metric.MICRO);
+	public static final LinearUnit MILLISECOND = Metric.SECOND.withPrefix(Metric.MILLI);
+	public static final LinearUnit KILOSECOND = Metric.SECOND.withPrefix(Metric.KILO);
+	public static final LinearUnit MEGASECOND = Metric.SECOND.withPrefix(Metric.MEGA);
 	
-	public static final LinearUnit MICROGRAM = SI.GRAM.withPrefix(SI.MICRO);
-	public static final LinearUnit MILLIGRAM = SI.GRAM.withPrefix(SI.MILLI);
-	public static final LinearUnit MEGAGRAM = SI.GRAM.withPrefix(SI.MEGA);
+	public static final LinearUnit MICROGRAM = Metric.GRAM.withPrefix(Metric.MICRO);
+	public static final LinearUnit MILLIGRAM = Metric.GRAM.withPrefix(Metric.MILLI);
+	public static final LinearUnit MEGAGRAM = Metric.GRAM.withPrefix(Metric.MEGA);
 	
-	public static final LinearUnit MICRONEWTON = SI.NEWTON.withPrefix(SI.MICRO);
-	public static final LinearUnit MILLINEWTON = SI.NEWTON.withPrefix(SI.MILLI);
-	public static final LinearUnit KILONEWTON = SI.NEWTON.withPrefix(SI.KILO);
-	public static final LinearUnit MEGANEWTON = SI.NEWTON.withPrefix(SI.MEGA);
+	public static final LinearUnit MICRONEWTON = Metric.NEWTON.withPrefix(Metric.MICRO);
+	public static final LinearUnit MILLINEWTON = Metric.NEWTON.withPrefix(Metric.MILLI);
+	public static final LinearUnit KILONEWTON = Metric.NEWTON.withPrefix(Metric.KILO);
+	public static final LinearUnit MEGANEWTON = Metric.NEWTON.withPrefix(Metric.MEGA);
 	
-	public static final LinearUnit MICROJOULE = SI.JOULE.withPrefix(SI.MICRO);
-	public static final LinearUnit MILLIJOULE = SI.JOULE.withPrefix(SI.MILLI);
-	public static final LinearUnit KILOJOULE = SI.JOULE.withPrefix(SI.KILO);
-	public static final LinearUnit MEGAJOULE = SI.JOULE.withPrefix(SI.MEGA);
+	public static final LinearUnit MICROJOULE = Metric.JOULE.withPrefix(Metric.MICRO);
+	public static final LinearUnit MILLIJOULE = Metric.JOULE.withPrefix(Metric.MILLI);
+	public static final LinearUnit KILOJOULE = Metric.JOULE.withPrefix(Metric.KILO);
+	public static final LinearUnit MEGAJOULE = Metric.JOULE.withPrefix(Metric.MEGA);
 	
-	public static final LinearUnit MICROWATT = SI.WATT.withPrefix(SI.MICRO);
-	public static final LinearUnit MILLIWATT = SI.WATT.withPrefix(SI.MILLI);
-	public static final LinearUnit KILOWATT = SI.WATT.withPrefix(SI.KILO);
-	public static final LinearUnit MEGAWATT = SI.WATT.withPrefix(SI.MEGA);
+	public static final LinearUnit MICROWATT = Metric.WATT.withPrefix(Metric.MICRO);
+	public static final LinearUnit MILLIWATT = Metric.WATT.withPrefix(Metric.MILLI);
+	public static final LinearUnit KILOWATT = Metric.WATT.withPrefix(Metric.KILO);
+	public static final LinearUnit MEGAWATT = Metric.WATT.withPrefix(Metric.MEGA);
 	
-	public static final LinearUnit MICROCOULOMB = SI.COULOMB
-			.withPrefix(SI.MICRO);
-	public static final LinearUnit MILLICOULOMB = SI.COULOMB
-			.withPrefix(SI.MILLI);
-	public static final LinearUnit KILOCOULOMB = SI.COULOMB.withPrefix(SI.KILO);
-	public static final LinearUnit MEGACOULOMB = SI.COULOMB.withPrefix(SI.MEGA);
+	public static final LinearUnit MICROCOULOMB = Metric.COULOMB
+			.withPrefix(Metric.MICRO);
+	public static final LinearUnit MILLICOULOMB = Metric.COULOMB
+			.withPrefix(Metric.MILLI);
+	public static final LinearUnit KILOCOULOMB = Metric.COULOMB.withPrefix(Metric.KILO);
+	public static final LinearUnit MEGACOULOMB = Metric.COULOMB.withPrefix(Metric.MEGA);
 	
-	public static final LinearUnit MICROAMPERE = SI.AMPERE.withPrefix(SI.MICRO);
-	public static final LinearUnit MILLIAMPERE = SI.AMPERE.withPrefix(SI.MILLI);
+	public static final LinearUnit MICROAMPERE = Metric.AMPERE.withPrefix(Metric.MICRO);
+	public static final LinearUnit MILLIAMPERE = Metric.AMPERE.withPrefix(Metric.MILLI);
 	
-	public static final LinearUnit MICROVOLT = SI.VOLT.withPrefix(SI.MICRO);
-	public static final LinearUnit MILLIVOLT = SI.VOLT.withPrefix(SI.MILLI);
-	public static final LinearUnit KILOVOLT = SI.VOLT.withPrefix(SI.KILO);
-	public static final LinearUnit MEGAVOLT = SI.VOLT.withPrefix(SI.MEGA);
+	public static final LinearUnit MICROVOLT = Metric.VOLT.withPrefix(Metric.MICRO);
+	public static final LinearUnit MILLIVOLT = Metric.VOLT.withPrefix(Metric.MILLI);
+	public static final LinearUnit KILOVOLT = Metric.VOLT.withPrefix(Metric.KILO);
+	public static final LinearUnit MEGAVOLT = Metric.VOLT.withPrefix(Metric.MEGA);
 	
-	public static final LinearUnit KILOOHM = SI.OHM.withPrefix(SI.KILO);
-	public static final LinearUnit MEGAOHM = SI.OHM.withPrefix(SI.MEGA);
+	public static final LinearUnit KILOOHM = Metric.OHM.withPrefix(Metric.KILO);
+	public static final LinearUnit MEGAOHM = Metric.OHM.withPrefix(Metric.MEGA);
 	
 	// sets of prefixes
 	public static final Set<UnitPrefix> ALL_PREFIXES = Set.of(DEKA, HECTO, KILO,
@@ -473,7 +473,7 @@ public final class SI {
 			MILLI, MICRO, NANO, PICO, FEMTO, ATTO, ZEPTO, YOCTO);
 	
 	// You may NOT get SI instances!
-	private SI() {
+	private Metric() {
 		throw new AssertionError();
 	}
 }
diff --git a/src/main/java/org/unitConverter/unit/MultiUnit.java b/src/main/java/sevenUnits/unit/MultiUnit.java
index a1623f8..83cdb03 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.utils.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/USCustomary.java b/src/main/java/sevenUnits/unit/USCustomary.java
index 1c4bcfe..459071f 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.
@@ -52,7 +52,7 @@ public final class USCustomary {
 		public static final LinearUnit YARD = BritishImperial.Length.YARD;
 		public static final LinearUnit MILE = BritishImperial.Length.MILE;
 
-		public static final LinearUnit SURVEY_FOOT = SI.METRE.times(1200.0 / 3937.0);
+		public static final LinearUnit SURVEY_FOOT = Metric.METRE.times(1200.0 / 3937.0);
 		public static final LinearUnit SURVEY_LINK = SURVEY_FOOT.times(33.0 / 50.0);
 		public static final LinearUnit SURVEY_ROD = SURVEY_FOOT.times(16.5);
 		public static final LinearUnit SURVEY_CHAIN = SURVEY_ROD.times(4);
@@ -97,7 +97,7 @@ public final class USCustomary {
 		public static final LinearUnit CUBIC_YARD = Length.YARD.toExponent(3);
 		public static final LinearUnit ACRE_FOOT = Area.ACRE.times(Length.FOOT);
 
-		public static final LinearUnit MINIM = SI.LITRE.withPrefix(SI.MICRO).times(61.611519921875);
+		public static final LinearUnit MINIM = Metric.LITRE.withPrefix(Metric.MICRO).times(61.611519921875);
 		public static final LinearUnit FLUID_DRAM = MINIM.times(60);
 		public static final LinearUnit TEASPOON = MINIM.times(80);
 		public static final LinearUnit TABLESPOON = TEASPOON.times(3);
@@ -112,7 +112,7 @@ public final class USCustomary {
 		public static final LinearUnit OIL_BARREL = GALLON.times(42);
 		public static final LinearUnit HOGSHEAD = GALLON.times(63);
 
-		public static final LinearUnit DRY_PINT = SI.LITRE.times(0.5506104713575);
+		public static final LinearUnit DRY_PINT = Metric.LITRE.times(0.5506104713575);
 		public static final LinearUnit DRY_QUART = DRY_PINT.times(2);
 		public static final LinearUnit DRY_GALLON = DRY_QUART.times(4);
 		public static final LinearUnit PECK = DRY_GALLON.times(2);
@@ -128,7 +128,7 @@ public final class USCustomary {
 	public static final LinearUnit KILOCALORIE = BritishImperial.KILOCALORIE;
 	public static final LinearUnit FOOT_POUND = POUND_FORCE.times(Length.FOOT);
 
-	public static final LinearUnit HORSEPOWER = Length.FOOT.times(POUND_FORCE).dividedBy(SI.MINUTE).times(33000);
+	public static final LinearUnit HORSEPOWER = Length.FOOT.times(POUND_FORCE).dividedBy(Metric.MINUTE).times(33000);
 	public static final LinearUnit POUND_PER_SQUARE_INCH = POUND_FORCE.dividedBy(Length.INCH.toExponent(2));
 
 	public static final Unit FAHRENHEIT = BritishImperial.FAHRENHEIT;
diff --git a/src/main/java/org/unitConverter/unit/Unit.java b/src/main/java/sevenUnits/unit/Unit.java
index 0a3298f..005b6f7 100644
--- a/src/main/java/org/unitConverter/unit/Unit.java
+++ b/src/main/java/sevenUnits/unit/Unit.java
@@ -14,17 +14,15 @@
  * 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;
 import java.util.Map;
 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.utils.DecimalComparison;
+import sevenUnits.utils.ObjectProduct;
 
 /**
  * A unit that is composed of base units.
@@ -110,6 +108,19 @@ public abstract class Unit implements Nameable {
 	private transient ObjectProduct<BaseDimension> dimension = null;
 	
 	/**
+	 * A constructor that constructs {@code BaseUnit} instances.
+	 * 
+	 * @since 2019-10-16
+	 */
+	Unit(final NameSymbol nameSymbol) {
+		if (this instanceof BaseUnit) {
+			this.unitBase = ObjectProduct.oneOf((BaseUnit) this);
+		} else
+			throw new AssertionError();
+		this.nameSymbol = nameSymbol;
+	}
+	
+	/**
 	 * Creates the {@code Unit}.
 	 * 
 	 * @param unitBase base of unit
@@ -117,28 +128,13 @@ public abstract class Unit implements Nameable {
 	 * @since 2019-10-16
 	 * @throws NullPointerException if unitBase or ns is null
 	 */
-	Unit(ObjectProduct<BaseUnit> unitBase, NameSymbol ns) {
+	protected Unit(ObjectProduct<BaseUnit> unitBase, NameSymbol ns) {
 		this.unitBase = Objects.requireNonNull(unitBase,
 				"unitBase may not be null");
 		this.nameSymbol = Objects.requireNonNull(ns, "ns may not be null");
 	}
 	
 	/**
-	 * A constructor that constructs {@code BaseUnit} instances.
-	 * 
-	 * @since 2019-10-16
-	 */
-	Unit(final String primaryName, final String symbol,
-			final Set<String> otherNames) {
-		if (this instanceof BaseUnit) {
-			this.unitBase = ObjectProduct.oneOf((BaseUnit) this);
-		} else
-			throw new AssertionError();
-		this.nameSymbol = NameSymbol.of(primaryName, symbol,
-				new HashSet<>(otherNames));
-	}
-	
-	/**
 	 * @return this unit as a {@link Unitlike}
 	 * @since 2020-09-07
 	 */
@@ -342,7 +338,7 @@ public abstract class Unit implements Nameable {
 		
 		// second condition - check that
 		for (final BaseUnit b : linear.getBase().getBaseSet()) {
-			if (!SI.BaseUnits.BASE_UNITS.contains(b))
+			if (!Metric.BaseUnits.BASE_UNITS.contains(b))
 				return false;
 		}
 		
diff --git a/src/main/java/org/unitConverter/unit/UnitDatabase.java b/src/main/java/sevenUnits/unit/UnitDatabase.java
index 673f119..b45d9cf 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.utils.ConditionalExistenceCollections;
+import sevenUnits.utils.DecimalComparison;
+import sevenUnits.utils.ExpressionParser;
+import sevenUnits.utils.ObjectProduct;
+import sevenUnits.utils.UncertainDouble;
 
 /**
  * A database of units, prefixes and dimensions, and their names.
@@ -1116,7 +1116,7 @@ public final class UnitDatabase {
 	private static final LinearUnit exponentiateUnits(final LinearUnit base,
 			final LinearUnit exponentUnit) {
 		// exponent function - first check if o2 is a number,
-		if (exponentUnit.getBase().equals(SI.ONE.getBase())) {
+		if (exponentUnit.getBase().equals(Metric.ONE.getBase())) {
 			// then check if it is an integer,
 			final double exponent = exponentUnit.getConversionFactor();
 			if (DecimalComparison.equals(exponent % 1, 0))
@@ -1142,7 +1142,7 @@ public final class UnitDatabase {
 	private static final LinearUnitValue exponentiateUnitValues(
 			final LinearUnitValue base, final LinearUnitValue exponentValue) {
 		// exponent function - first check if o2 is a number,
-		if (exponentValue.canConvertTo(SI.ONE)) {
+		if (exponentValue.canConvertTo(Metric.ONE)) {
 			// then check if it is an integer,
 			final double exponent = exponentValue.getValueExact();
 			if (DecimalComparison.equals(exponent % 1, 0))
@@ -1676,7 +1676,7 @@ public final class UnitDatabase {
 			final BigDecimal number = new BigDecimal(name);
 			
 			final double uncertainty = Math.pow(10, -number.scale());
-			return LinearUnitValue.of(SI.ONE,
+			return LinearUnitValue.of(Metric.ONE,
 					UncertainDouble.of(number.doubleValue(), uncertainty));
 		} catch (final NumberFormatException e) {
 			return LinearUnitValue.getExact(this.getLinearUnit(name), 1);
@@ -1786,7 +1786,7 @@ public final class UnitDatabase {
 	public Unit getUnit(final String name) {
 		try {
 			final double value = Double.parseDouble(name);
-			return SI.ONE.times(value);
+			return Metric.ONE.times(value);
 		} catch (final NumberFormatException e) {
 			final Unit unit = this.units.get(name);
 			if (unit == null)
diff --git a/src/main/java/org/unitConverter/unit/UnitPrefix.java b/src/main/java/sevenUnits/unit/UnitPrefix.java
index 31cc0b3..308f4b0 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.utils.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..d2dcbbb 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.utils.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
diff --git a/src/main/java/org/unitConverter/math/ConditionalExistenceCollections.java b/src/main/java/sevenUnits/utils/ConditionalExistenceCollections.java
index 000658b..2adb579 100644
--- a/src/main/java/org/unitConverter/math/ConditionalExistenceCollections.java
+++ b/src/main/java/sevenUnits/utils/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.utils;
 
 import java.util.AbstractCollection;
 import java.util.AbstractMap;
diff --git a/src/main/java/org/unitConverter/math/DecimalComparison.java b/src/main/java/sevenUnits/utils/DecimalComparison.java
index 0f5b91e..a5cbbaa 100644
--- a/src/main/java/org/unitConverter/math/DecimalComparison.java
+++ b/src/main/java/sevenUnits/utils/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.utils;
 
 import java.math.BigDecimal;
 
diff --git a/src/main/java/org/unitConverter/math/ExpressionParser.java b/src/main/java/sevenUnits/utils/ExpressionParser.java
index deee51d..1d3d44d 100644
--- a/src/main/java/org/unitConverter/math/ExpressionParser.java
+++ b/src/main/java/sevenUnits/utils/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.utils;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
diff --git a/src/main/java/org/unitConverter/math/ObjectProduct.java b/src/main/java/sevenUnits/utils/ObjectProduct.java
index 5217d93..1dacb7d 100644
--- a/src/main/java/org/unitConverter/math/ObjectProduct.java
+++ b/src/main/java/sevenUnits/utils/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.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/org/unitConverter/math/UncertainDouble.java b/src/main/java/sevenUnits/utils/UncertainDouble.java
index 3651bd5..8fe4b31 100644
--- a/src/main/java/org/unitConverter/math/UncertainDouble.java
+++ b/src/main/java/sevenUnits/utils/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.utils;
 
 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/utils/package-info.java
index 65727e4..350c62d 100644
--- a/src/main/java/org/unitConverter/math/package-info.java
+++ b/src/main/java/sevenUnits/utils/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2019 Adrien Hopkins
+ * Copyright (C) 2018-2020 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
@@ -15,10 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 /**
- * Supplementary classes that are not related to units, but are necessary for their function.
+ * Supplementary classes that are not related to units, but are necessary for
+ * their function.
  * 
  * @author Adrien Hopkins
  * @since 2019-03-14
  * @since v0.2.0
  */
-package org.unitConverter.math;
\ No newline at end of file
+package sevenUnits.utils;
\ No newline at end of file