diff --git a/TRANSFORM/Nuclear/DoseCalculations/Examples/AverageSoftTissueDose_C14.mo b/TRANSFORM/Nuclear/DoseCalculations/Examples/AverageSoftTissueDose_C14.mo
index 3b5be595..656d3dc1 100644
--- a/TRANSFORM/Nuclear/DoseCalculations/Examples/AverageSoftTissueDose_C14.mo
+++ b/TRANSFORM/Nuclear/DoseCalculations/Examples/AverageSoftTissueDose_C14.mo
@@ -1,7 +1,6 @@
 within TRANSFORM.Nuclear.DoseCalculations.Examples;
 model AverageSoftTissueDose_C14
 
-
   Dose_AlphaBetaTissue dose(A=1.2e5/0.05, E_bar=
         SIadd.Conversions.Functions.Energy_J.from_MeV(0.0495))
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
diff --git a/TRANSFORM/Units/Conversions/Functions/Activity_Bq/package.mo b/TRANSFORM/Units/Conversions/Functions/Activity_Bq/package.mo
index 37461204..5fc2eeb6 100644
--- a/TRANSFORM/Units/Conversions/Functions/Activity_Bq/package.mo
+++ b/TRANSFORM/Units/Conversions/Functions/Activity_Bq/package.mo
@@ -1,10 +1,4 @@
 within TRANSFORM.Units.Conversions.Functions;
 package Activity_Bq "Conversions for activity (e.g., bequeral, curies). SI unit is [Bq], i.e., [1/s]"
 
-  function to_Bq "Activity: [Bq] -> [Bq]"
-    extends BaseClasses.to;
-
-  algorithm
-    y := u;
-  end to_Bq;
 end Activity_Bq;
diff --git a/TRANSFORM/Units/Conversions/Functions/Activity_Bq/to_Bq.mo b/TRANSFORM/Units/Conversions/Functions/Activity_Bq/to_Bq.mo
new file mode 100644
index 00000000..7384cc1a
--- /dev/null
+++ b/TRANSFORM/Units/Conversions/Functions/Activity_Bq/to_Bq.mo
@@ -0,0 +1,7 @@
+within TRANSFORM.Units.Conversions.Functions.Activity_Bq;
+function to_Bq "Activity: [Bq] -> [Bq]"
+  extends BaseClasses.to;
+
+algorithm
+  y := u;
+end to_Bq;
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/from.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/from.mo
deleted file mode 100644
index 0f46f281..00000000
--- a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/from.mo
+++ /dev/null
@@ -1,8 +0,0 @@
-within TRANSFORM.Units.Conversions.Functions.SpecificActivity_Bq.BaseClasses;
-partial function from
-  import TRANSFORM;
-  extends TRANSFORM.Units.Conversions.Functions.BaseClasses.PartialConversion;
-
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)));
-end from;
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/package.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/package.mo
deleted file mode 100644
index 236a847f..00000000
--- a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/package.mo
+++ /dev/null
@@ -1,5 +0,0 @@
-within TRANSFORM.Units.Conversions.Functions.SpecificActivity_Bq;
-package BaseClasses
-
-
-end BaseClasses;
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/package.order b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/package.order
deleted file mode 100644
index 97cb691e..00000000
--- a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/package.order
+++ /dev/null
@@ -1,2 +0,0 @@
-to
-from
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/to.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/to.mo
deleted file mode 100644
index fdbf0db0..00000000
--- a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/BaseClasses/to.mo
+++ /dev/null
@@ -1,8 +0,0 @@
-within TRANSFORM.Units.Conversions.Functions.SpecificActivity_Bq.BaseClasses;
-partial function to
-  import TRANSFORM;
-  extends TRANSFORM.Units.Conversions.Functions.BaseClasses.PartialConversion;
-
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)));
-end to;
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/from_Bq.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/from_Bq.mo
deleted file mode 100644
index 818a2cf5..00000000
--- a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/from_Bq.mo
+++ /dev/null
@@ -1,7 +0,0 @@
-within TRANSFORM.Units.Conversions.Functions.SpecificActivity_Bq;
-function from_Bq "Activity: [Bq/kg] -> [Bq/kg]"
-  extends BaseClasses.from;
-
-algorithm
-  y := u;
-end from_Bq;
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/from_Ci.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/from_Ci.mo
deleted file mode 100644
index b8198a00..00000000
--- a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/from_Ci.mo
+++ /dev/null
@@ -1,7 +0,0 @@
-within TRANSFORM.Units.Conversions.Functions.SpecificActivity_Bq;
-function from_Ci "Activity: [Ci/kg] -> [Bq/kg]"
-  extends BaseClasses.from;
-
-algorithm
-  y := u*3.7e10;
-end from_Ci;
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/package.order b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/package.order
deleted file mode 100644
index 70011f63..00000000
--- a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/package.order
+++ /dev/null
@@ -1,5 +0,0 @@
-BaseClasses
-to_Bq
-from_Bq
-to_Ci
-from_Ci
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/to_Bq.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/to_Bq.mo
deleted file mode 100644
index e430d9db..00000000
--- a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/to_Bq.mo
+++ /dev/null
@@ -1,7 +0,0 @@
-within TRANSFORM.Units.Conversions.Functions.SpecificActivity_Bq;
-function to_Bq "Activity: [Bq/kg] -> [Bq/kg]"
-  extends BaseClasses.to;
-
-algorithm
-  y := u;
-end to_Bq;
diff --git a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/to_Ci.mo b/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/to_Ci.mo
deleted file mode 100644
index 46fcfa8d..00000000
--- a/TRANSFORM/Units/Conversions/Functions/SpecificActivity_Bq/to_Ci.mo
+++ /dev/null
@@ -1,7 +0,0 @@
-within TRANSFORM.Units.Conversions.Functions.SpecificActivity_Bq;
-function to_Ci "Activity: [Bq/kg] -> [Ci/kg]"
-  extends BaseClasses.to;
-
-algorithm
-  y := u/(3.7e10);
-end to_Ci;
diff --git a/TRANSFORM/Units/Dose.mo b/TRANSFORM/Units/Dose.mo
new file mode 100644
index 00000000..bc01a394
--- /dev/null
+++ b/TRANSFORM/Units/Dose.mo
@@ -0,0 +1,2 @@
+within TRANSFORM.Units;
+type Dose = Real (final unit="J/kg", final quantity= "Dose") "Dose [J/kg]";
diff --git a/TRANSFORM/Units/DoseRate.mo b/TRANSFORM/Units/DoseRate.mo
new file mode 100644
index 00000000..d3b993f2
--- /dev/null
+++ b/TRANSFORM/Units/DoseRate.mo
@@ -0,0 +1,3 @@
+within TRANSFORM.Units;
+type DoseRate =Real (final unit="J/(s.kg)", final quantity= "DoseRate")
+  "Dose rate [J/(kg.s)]";
diff --git a/TRANSFORM/Units/SpecificActivity.mo b/TRANSFORM/Units/SpecificActivity.mo
new file mode 100644
index 00000000..c8244169
--- /dev/null
+++ b/TRANSFORM/Units/SpecificActivity.mo
@@ -0,0 +1,3 @@
+within TRANSFORM.Units;
+type SpecificActivity = Real (final unit="1/(s.kg)", final quantity= "SpecificActivity")
+  "Specific activity [1/(s.kg)]";
diff --git a/TRANSFORM/Units/StoppingPowerParticle.mo b/TRANSFORM/Units/StoppingPowerParticle.mo
new file mode 100644
index 00000000..0107294a
--- /dev/null
+++ b/TRANSFORM/Units/StoppingPowerParticle.mo
@@ -0,0 +1,3 @@
+within TRANSFORM.Units;
+type StoppingPowerParticle =Real (final unit="J/m", final quantity= "StoppingPowerParticle")
+  "Stopping power for particles [J/m]";
diff --git a/TRANSFORM/Units/package.mo b/TRANSFORM/Units/package.mo
index bc4be611..a59c9e3c 100644
--- a/TRANSFORM/Units/package.mo
+++ b/TRANSFORM/Units/package.mo
@@ -3,14 +3,7 @@ package Units "Additional models, functions, types, etc. for units"
   extends TRANSFORM.Icons.UnitsPackage;
 
 
-  type SpecificActivity = Real (final unit="1/(s.kg)", final quantity= "SpecificActivity")
-    "Specific activity [1/(s.kg)]";
 
-  type Dose = Real (final unit="J/kg", final quantity= "Dose") "Dose [J/kg]";
 
-  type DoseRate =Real (final unit="J/(s.kg)", final quantity= "DoseRate")
-    "Dose rate [J/(kg.s)]";
 
-  type StoppingPowerParticle =Real (final unit="J/m", final quantity= "StoppingPowerParticle")
-    "Stopping power for particles [J/m]";
 end Units;