refactor: physical replaced with isq

Refers to #249
2021-03-16 12:03:25 +01:00
parent f3bcdc4ad2
commit bbbb77286c
304 changed files with 1354 additions and 1354 deletions
@@ -23,14 +23,14 @@
 #pragma once

 #include <units/customization_points.h>
-#include <units/physical/si/time.h>
+#include <units/isq/si/time.h>
 #include <chrono>

 namespace units {

 template<typename Rep, typename Period>
 struct quantity_like_traits<std::chrono::duration<Rep, Period>> {
-  using dimension = physical::si::dim_time;
+  using dimension = isq::si::dim_time;
  using unit = downcast_unit<dimension, ratio(Period::num, Period::den)>;
  using rep = Rep;
  [[nodiscard]] static constexpr rep count(const std::chrono::duration<Rep, Period>& q) { return q.count(); }
@@ -38,7 +38,7 @@ struct quantity_like_traits<std::chrono::duration<Rep, Period>> {

 template<typename C, typename Rep, typename Period>
 struct quantity_point_like_traits<std::chrono::time_point<C, std::chrono::duration<Rep, Period>>> {
-  using dimension = physical::si::dim_time;
+  using dimension = isq::si::dim_time;
  using unit = downcast_unit<dimension, ratio(Period::num, Period::den)>;
  using rep = Rep;
  [[nodiscard]] static constexpr auto relative(
@@ -24,19 +24,19 @@

 #include <units/data/information.h>
 #include <units/derived_dimension.h>
-#include <units/physical/si/time.h>
+#include <units/isq/si/time.h>
 #include <units/quantity.h>

 namespace units::data {

 struct bit_per_second : unit<bit_per_second> {};
-struct dim_bitrate : derived_dimension<dim_bitrate, bit_per_second, exponent<dim_information, 1>, exponent<physical::si::dim_time, -1>> {};
+struct dim_bitrate : derived_dimension<dim_bitrate, bit_per_second, exponent<dim_information, 1>, exponent<isq::si::dim_time, -1>> {};

-struct kibibit_per_second : deduced_unit<kibibit_per_second, dim_bitrate, kibibit, physical::si::second> {};
-struct mebibit_per_second : deduced_unit<mebibit_per_second, dim_bitrate, mebibit, physical::si::second> {};
-struct gibibit_per_second : deduced_unit<gibibit_per_second, dim_bitrate, gibibit, physical::si::second> {};
-struct tebibit_per_second : deduced_unit<tebibit_per_second, dim_bitrate, tebibit, physical::si::second> {};
-struct pebibit_per_second : deduced_unit<pebibit_per_second, dim_bitrate, pebibit, physical::si::second> {};
+struct kibibit_per_second : deduced_unit<kibibit_per_second, dim_bitrate, kibibit, isq::si::second> {};
+struct mebibit_per_second : deduced_unit<mebibit_per_second, dim_bitrate, mebibit, isq::si::second> {};
+struct gibibit_per_second : deduced_unit<gibibit_per_second, dim_bitrate, gibibit, isq::si::second> {};
+struct tebibit_per_second : deduced_unit<tebibit_per_second, dim_bitrate, tebibit, isq::si::second> {};
+struct pebibit_per_second : deduced_unit<pebibit_per_second, dim_bitrate, pebibit, isq::si::second> {};

 template<typename T>
 concept Bitrate = QuantityOf<T, dim_bitrate>;
@@ -22,12 +22,12 @@

 #pragma once

-#include <units/physical/si/prefixes.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

 namespace units {

-struct radian : named_unit<radian, "rad", physical::si::prefix> {};
+struct radian : named_unit<radian, "rad", isq::si::prefix> {};

 template<Unit U = radian>
 struct dim_angle : base_dimension<"A", U> {};
@@ -0,0 +1,70 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2018 Mateusz Pusz
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#pragma once
+
+#include <units/isq/dimensions/absorbed_dose.h>
+#include <units/isq/dimensions/acceleration.h>
+#include <units/isq/dimensions/amount_of_substance.h>
+#include <units/isq/dimensions/angular_velocity.h>
+#include <units/isq/dimensions/area.h>
+#include <units/isq/dimensions/capacitance.h>
+#include <units/isq/dimensions/catalytic_activity.h>
+#include <units/isq/dimensions/charge_density.h>
+#include <units/isq/dimensions/concentration.h>
+#include <units/isq/dimensions/conductance.h>
+#include <units/isq/dimensions/current_density.h>
+#include <units/isq/dimensions/density.h>
+#include <units/isq/dimensions/dynamic_viscosity.h>
+#include <units/isq/dimensions/electric_charge.h>
+#include <units/isq/dimensions/electric_current.h>
+#include <units/isq/dimensions/electric_field_strength.h>
+#include <units/isq/dimensions/energy.h>
+// TODO Add when downcasting issue is solved (collides with pressure)
+// #include <units/isq/dimensions/energy_density.h>
+#include <units/isq/dimensions/force.h>
+#include <units/isq/dimensions/frequency.h>
+#include <units/isq/dimensions/heat_capacity.h>
+#include <units/isq/dimensions/inductance.h>
+#include <units/isq/dimensions/length.h>
+#include <units/isq/dimensions/luminance.h>
+#include <units/isq/dimensions/luminous_intensity.h>
+#include <units/isq/dimensions/magnetic_flux.h>
+#include <units/isq/dimensions/magnetic_induction.h>
+#include <units/isq/dimensions/mass.h>
+#include <units/isq/dimensions/molar_energy.h>
+#include <units/isq/dimensions/momentum.h>
+#include <units/isq/dimensions/permeability.h>
+#include <units/isq/dimensions/permittivity.h>
+#include <units/isq/dimensions/power.h>
+#include <units/isq/dimensions/pressure.h>
+// TODO Add when downcasting issue is solved (collides with frequency)
+// #include <units/isq/dimensions/radioactivity.h>
+#include <units/isq/dimensions/resistance.h>
+#include <units/isq/dimensions/speed.h>
+#include <units/isq/dimensions/surface_tension.h>
+#include <units/isq/dimensions/thermal_conductivity.h>
+#include <units/isq/dimensions/thermodynamic_temperature.h>
+#include <units/isq/dimensions/time.h>
+#include <units/isq/dimensions/torque.h>
+#include <units/isq/dimensions/voltage.h>
+#include <units/isq/dimensions/volume.h>
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/energy.h>
-#include <units/physical/dimensions/mass.h>
+#include <units/isq/dimensions/energy.h>
+#include <units/isq/dimensions/mass.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_energy> E, DimensionOfT<dim_mass> M>
 struct dim_absorbed_dose : derived_dimension<Child, U, exponent<E, 1>, exponent<M, -1>> {};
@@ -34,4 +34,4 @@ struct dim_absorbed_dose : derived_dimension<Child, U, exponent<E, 1>, exponent<
 template<typename T>
 concept AbsorbedDose = QuantityOfT<T, dim_absorbed_dose>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/length.h>
-#include <units/physical/dimensions/time.h>
+#include <units/isq/dimensions/length.h>
+#include <units/isq/dimensions/time.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_length> L, DimensionOfT<dim_time> T>
 struct dim_acceleration : derived_dimension<Child, U, exponent<L, 1>, exponent<T, -2>> {};
@@ -34,4 +34,4 @@ struct dim_acceleration : derived_dimension<Child, U, exponent<L, 1>, exponent<T
 template<typename T>
 concept Acceleration = QuantityOfT<T, dim_acceleration>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -24,7 +24,7 @@

 #include <units/concepts.h>

-namespace units::physical {
+namespace units::isq {

 template<Unit U>
 struct dim_amount_of_substance : base_dimension<"N", U> {};
@@ -32,4 +32,4 @@ struct dim_amount_of_substance : base_dimension<"N", U> {};
 template<typename T>
 concept AmountOfSubstance = QuantityOfT<T, dim_amount_of_substance>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -24,9 +24,9 @@

 #include <units/generic/angle.h>
 #include <units/concepts.h>
-#include <units/physical/dimensions/time.h>
+#include <units/isq/dimensions/time.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_angle> A, DimensionOfT<dim_time> T>
 struct dim_angular_velocity : derived_dimension<Child, U, exponent<A, 1>, exponent<T, -1>> {};
@@ -34,4 +34,4 @@ struct dim_angular_velocity : derived_dimension<Child, U, exponent<A, 1>, expone
 template <typename T>
 concept AngularVelocity = QuantityOfT<T, dim_angular_velocity>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,9 +23,9 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/length.h>
+#include <units/isq/dimensions/length.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_length> L>
 struct dim_area : derived_dimension<Child, U, exponent<L, 2>> {};
@@ -33,4 +33,4 @@ struct dim_area : derived_dimension<Child, U, exponent<L, 2>> {};
 template<typename T>
 concept Area = QuantityOfT<T, dim_area>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/electric_charge.h>
-#include <units/physical/dimensions/voltage.h>
+#include <units/isq/dimensions/electric_charge.h>
+#include <units/isq/dimensions/voltage.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_electric_charge> C, DimensionOfT<dim_voltage> V>
 struct dim_capacitance : derived_dimension<Child, U, exponent<C, 1>, exponent<V, -1>> {};
@@ -34,4 +34,4 @@ struct dim_capacitance : derived_dimension<Child, U, exponent<C, 1>, exponent<V,
 template<typename T>
 concept Capacitance = QuantityOfT<T, dim_capacitance>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -22,11 +22,11 @@

 #pragma once

-#include <units/physical/dimensions/amount_of_substance.h>
+#include <units/isq/dimensions/amount_of_substance.h>
 #include <units/concepts.h>
-#include <units/physical/dimensions/time.h>
+#include <units/isq/dimensions/time.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_time> T, DimensionOfT<dim_amount_of_substance> M>
 struct dim_catalytic_activity : derived_dimension<Child, U, exponent<T, -1>, exponent<M, 1>> {};
@@ -34,4 +34,4 @@ struct dim_catalytic_activity : derived_dimension<Child, U, exponent<T, -1>, exp
 template<typename T>
 concept CatalyticActivity = QuantityOfT<T, dim_catalytic_activity>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/electric_charge.h>
-#include <units/physical/dimensions/length.h>
+#include <units/isq/dimensions/electric_charge.h>
+#include <units/isq/dimensions/length.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_electric_charge> Q, DimensionOfT<dim_length> L>
 struct dim_charge_density : derived_dimension<Child, U, exponent<Q, 1>, exponent<L, -3>> {};
@@ -40,4 +40,4 @@ concept ChargeDensity = QuantityOfT<T, dim_charge_density>;
 template<typename T>
 concept SurfaceChargeDensity = QuantityOfT<T, dim_surface_charge_density>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/length.h>
-#include <units/physical/dimensions/amount_of_substance.h>
+#include <units/isq/dimensions/length.h>
+#include <units/isq/dimensions/amount_of_substance.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_amount_of_substance> M, DimensionOfT<dim_length> L>
 struct dim_concentration : derived_dimension<Child, U, exponent<M, 1>, exponent<L, -3>> {};
@@ -34,4 +34,4 @@ struct dim_concentration : derived_dimension<Child, U, exponent<M, 1>, exponent<
 template<typename T>
 concept Concentration = QuantityOfT<T, dim_concentration>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,9 +23,9 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/resistance.h>
+#include <units/isq/dimensions/resistance.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_resistance> R>
 struct dim_conductance : derived_dimension<Child, U, exponent<R, -1>> {};
@@ -33,4 +33,4 @@ struct dim_conductance : derived_dimension<Child, U, exponent<R, -1>> {};
 template<typename T>
 concept Conductance = QuantityOfT<T, dim_conductance>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/electric_current.h>
-#include <units/physical/dimensions/length.h>
+#include <units/isq/dimensions/electric_current.h>
+#include <units/isq/dimensions/length.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_electric_current> I, DimensionOfT<dim_length> L>
 struct dim_current_density : derived_dimension<Child, U, exponent<I, 1>, exponent<L, -2>> {};
@@ -34,4 +34,4 @@ struct dim_current_density : derived_dimension<Child, U, exponent<I, 1>, exponen
 template<typename T>
 concept CurrentDensity = QuantityOfT<T, dim_current_density>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/length.h>
-#include <units/physical/dimensions/mass.h>
+#include <units/isq/dimensions/length.h>
+#include <units/isq/dimensions/mass.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_mass> M, DimensionOfT<dim_length> L>
 struct dim_density : derived_dimension<Child, U, exponent<M, 1>, exponent<L, -3>> {};
@@ -34,4 +34,4 @@ struct dim_density : derived_dimension<Child, U, exponent<M, 1>, exponent<L, -3>
 template<typename T>
 concept Density = QuantityOfT<T, dim_density>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/pressure.h>
-#include <units/physical/dimensions/time.h>
+#include <units/isq/dimensions/pressure.h>
+#include <units/isq/dimensions/time.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_pressure> P, DimensionOfT<dim_time> T>
 struct dim_dynamic_viscosity : derived_dimension<Child, U, exponent<P, 1>, exponent<T, 1>> {};
@@ -34,4 +34,4 @@ struct dim_dynamic_viscosity : derived_dimension<Child, U, exponent<P, 1>, expon
 template<typename T>
 concept DynamicViscosity = QuantityOfT<T, dim_dynamic_viscosity>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/electric_current.h>
-#include <units/physical/dimensions/time.h>
+#include <units/isq/dimensions/electric_current.h>
+#include <units/isq/dimensions/time.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_time> T, DimensionOfT<dim_electric_current> C>
 struct dim_electric_charge : derived_dimension<Child, U, exponent<T, 1>, exponent<C, 1>> {};
@@ -34,4 +34,4 @@ struct dim_electric_charge : derived_dimension<Child, U, exponent<T, 1>, exponen
 template<typename T>
 concept ElectricCharge = QuantityOfT<T, dim_electric_charge>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -24,7 +24,7 @@

 #include <units/concepts.h>

-namespace units::physical {
+namespace units::isq {

 template<Unit U>
 struct dim_electric_current : base_dimension<"I", U> {};
@@ -32,4 +32,4 @@ struct dim_electric_current : base_dimension<"I", U> {};
 template<typename T>
 concept ElectricCurrent = QuantityOfT<T, dim_electric_current>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/length.h>
-#include <units/physical/dimensions/voltage.h>
+#include <units/isq/dimensions/length.h>
+#include <units/isq/dimensions/voltage.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_voltage> V, DimensionOfT<dim_length> L>
 struct dim_electric_field_strength : derived_dimension<Child, U, exponent<V, 1>, exponent<L, -1>> {};
@@ -34,4 +34,4 @@ struct dim_electric_field_strength : derived_dimension<Child, U, exponent<V, 1>,
 template<typename T>
 concept ElectricFieldStrength = QuantityOfT<T, dim_electric_field_strength>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/force.h>
-#include <units/physical/dimensions/length.h>
+#include <units/isq/dimensions/force.h>
+#include <units/isq/dimensions/length.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_force> F, DimensionOfT<dim_length> L>
 struct dim_energy : derived_dimension<Child, U, exponent<F, 1>, exponent<L, 1>> {};
@@ -34,4 +34,4 @@ struct dim_energy : derived_dimension<Child, U, exponent<F, 1>, exponent<L, 1>>
 template<typename T>
 concept Energy = QuantityOfT<T, dim_energy>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/energy.h>
-#include <units/physical/dimensions/volume.h>
+#include <units/isq/dimensions/energy.h>
+#include <units/isq/dimensions/volume.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_energy> E, DimensionOfT<dim_volume> V>
 struct dim_energy_density : derived_dimension<Child, U, exponent<E, 1>, exponent<V, -1>> {};
@@ -34,4 +34,4 @@ struct dim_energy_density : derived_dimension<Child, U, exponent<E, 1>, exponent
 template<typename T>
 concept EnergyDensity = QuantityOfT<T, dim_energy_density>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -22,11 +22,11 @@

 #pragma once

-#include <units/physical/dimensions/acceleration.h>
+#include <units/isq/dimensions/acceleration.h>
 #include <units/concepts.h>
-#include <units/physical/dimensions/mass.h>
+#include <units/isq/dimensions/mass.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_mass> M, DimensionOfT<dim_acceleration> A>
 struct dim_force : derived_dimension<Child, U, exponent<M, 1>, exponent<A, 1>> {};
@@ -34,4 +34,4 @@ struct dim_force : derived_dimension<Child, U, exponent<M, 1>, exponent<A, 1>> {
 template<typename T>
 concept Force = QuantityOfT<T, dim_force>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,9 +23,9 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/time.h>
+#include <units/isq/dimensions/time.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_time> T>
 struct dim_frequency : derived_dimension<Child, U, exponent<T, -1>> {};
@@ -33,4 +33,4 @@ struct dim_frequency : derived_dimension<Child, U, exponent<T, -1>> {};
 template<typename T>
 concept Frequency = QuantityOfT<T, dim_frequency>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -22,13 +22,13 @@

 #pragma once

-#include <units/physical/dimensions/amount_of_substance.h>
+#include <units/isq/dimensions/amount_of_substance.h>
 #include <units/concepts.h>
-#include <units/physical/dimensions/energy.h>
-#include <units/physical/dimensions/mass.h>
-#include <units/physical/dimensions/thermodynamic_temperature.h>
+#include <units/isq/dimensions/energy.h>
+#include <units/isq/dimensions/mass.h>
+#include <units/isq/dimensions/thermodynamic_temperature.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_energy> E, DimensionOfT<dim_thermodynamic_temperature> T>
 struct dim_heat_capacity : derived_dimension<Child, U, exponent<E, 1>, exponent<T, -1>> {};
@@ -48,4 +48,4 @@ concept SpecificHeatCapacity = QuantityOfT<T, dim_specific_heat_capacity>;
 template<typename T>
 concept MolarHeatCapacity = QuantityOfT<T, dim_molar_heat_capacity>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/electric_current.h>
-#include <units/physical/dimensions/magnetic_flux.h>
+#include <units/isq/dimensions/electric_current.h>
+#include <units/isq/dimensions/magnetic_flux.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_magnetic_flux> F, DimensionOfT<dim_electric_current> I>
 struct dim_inductance : derived_dimension<Child, U, exponent<F, 1>, exponent<I, -1>> {};
@@ -34,4 +34,4 @@ struct dim_inductance : derived_dimension<Child, U, exponent<F, 1>, exponent<I,
 template<typename T>
 concept Inductance = QuantityOfT<T, dim_inductance>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -24,7 +24,7 @@

 #include <units/concepts.h>

-namespace units::physical {
+namespace units::isq {

 template<Unit U>
 struct dim_length : base_dimension<"L", U> {};
@@ -32,4 +32,4 @@ struct dim_length : base_dimension<"L", U> {};
 template<typename T>
 concept Length = QuantityOfT<T, dim_length>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/luminous_intensity.h>
-#include <units/physical/dimensions/length.h>
+#include <units/isq/dimensions/luminous_intensity.h>
+#include <units/isq/dimensions/length.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_luminous_intensity> I, DimensionOfT<dim_length> L>
 struct dim_luminance : derived_dimension<Child, U, exponent<I, 1>, exponent<L, -2>> {};
@@ -34,4 +34,4 @@ struct dim_luminance : derived_dimension<Child, U, exponent<I, 1>, exponent<L, -
 template<typename T>
 concept Luminance = QuantityOfT<T, dim_luminance>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -24,7 +24,7 @@

 #include <units/concepts.h>

-namespace units::physical {
+namespace units::isq {

 template<Unit U>
 struct dim_luminous_intensity : base_dimension<"J", U> {};
@@ -32,4 +32,4 @@ struct dim_luminous_intensity : base_dimension<"J", U> {};
 template<typename T>
 concept LuminousIntensity = QuantityOfT<T, dim_luminous_intensity>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -22,11 +22,11 @@

 #pragma once

-#include <units/physical/dimensions/area.h>
+#include <units/isq/dimensions/area.h>
 #include <units/concepts.h>
-#include <units/physical/dimensions/magnetic_induction.h>
+#include <units/isq/dimensions/magnetic_induction.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_magnetic_induction> B, DimensionOfT<dim_area> A>
 struct dim_magnetic_flux : derived_dimension<Child, U, exponent<B, 1>, exponent<A, 1>> {};
@@ -34,4 +34,4 @@ struct dim_magnetic_flux : derived_dimension<Child, U, exponent<B, 1>, exponent<
 template<typename T>
 concept MagneticFlux = QuantityOfT<T, dim_magnetic_flux>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,11 +23,11 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/length.h>
-#include <units/physical/dimensions/time.h>
-#include <units/physical/dimensions/voltage.h>
+#include <units/isq/dimensions/length.h>
+#include <units/isq/dimensions/time.h>
+#include <units/isq/dimensions/voltage.h>

-namespace units::physical {
+namespace units::isq {

 template <typename Child, Unit U, DimensionOfT<dim_voltage> V, DimensionOfT<dim_time> T, DimensionOfT<dim_length> L>
 struct dim_magnetic_induction : derived_dimension<Child, U, exponent<V, 1>, exponent<T, 1>, exponent<L, -2>> {};
@@ -35,4 +35,4 @@ struct dim_magnetic_induction : derived_dimension<Child, U, exponent<V, 1>, expo
 template<typename T>
 concept MagneticInduction = QuantityOfT<T, dim_magnetic_induction>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -24,7 +24,7 @@

 #include <units/concepts.h>

-namespace units::physical {
+namespace units::isq {

 template<Unit U>
 struct dim_mass : base_dimension<"M", U> {};
@@ -32,4 +32,4 @@ struct dim_mass : base_dimension<"M", U> {};
 template<typename T>
 concept Mass = QuantityOfT<T, dim_mass>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -22,11 +22,11 @@

 #pragma once

-#include <units/physical/dimensions/amount_of_substance.h>
+#include <units/isq/dimensions/amount_of_substance.h>
 #include <units/concepts.h>
-#include <units/physical/dimensions/energy.h>
+#include <units/isq/dimensions/energy.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_energy> E, DimensionOfT<dim_amount_of_substance> M>
 struct dim_molar_energy : derived_dimension<Child, U, exponent<E, 1>, exponent<M, -1>> {};
@@ -34,4 +34,4 @@ struct dim_molar_energy : derived_dimension<Child, U, exponent<E, 1>, exponent<M
 template<typename T>
 concept MolarEnergy = QuantityOfT<T, dim_molar_energy>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,9 +23,9 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/speed.h>
+#include <units/isq/dimensions/speed.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_mass> M, DimensionOfT<dim_speed> V>
 struct dim_momentum : derived_dimension<Child, U, exponent<M, 1>, exponent<V, 1>> {};
@@ -33,4 +33,4 @@ struct dim_momentum : derived_dimension<Child, U, exponent<M, 1>, exponent<V, 1>
 template<typename T>
 concept Momentum = QuantityOfT<T, dim_momentum>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/inductance.h>
-#include <units/physical/dimensions/length.h>
+#include <units/isq/dimensions/inductance.h>
+#include <units/isq/dimensions/length.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_inductance> H, DimensionOfT<dim_length> L>
 struct dim_permeability : derived_dimension<Child, U, exponent<H, 1>, exponent<L, -1>> {};
@@ -34,4 +34,4 @@ struct dim_permeability : derived_dimension<Child, U, exponent<H, 1>, exponent<L
 template<typename T>
 concept Permeability = QuantityOfT<T, dim_permeability>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -22,11 +22,11 @@

 #pragma once

-#include <units/physical/dimensions/capacitance.h>
+#include <units/isq/dimensions/capacitance.h>
 #include <units/concepts.h>
-#include <units/physical/dimensions/length.h>
+#include <units/isq/dimensions/length.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_capacitance> C, DimensionOfT<dim_length> L>
 struct dim_permittivity : derived_dimension<Child, U, exponent<C, 1>, exponent<L, -1>> {};
@@ -34,4 +34,4 @@ struct dim_permittivity : derived_dimension<Child, U, exponent<C, 1>, exponent<L
 template<typename T>
 concept Permittivity = QuantityOfT<T, dim_permittivity>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/energy.h>
-#include <units/physical/dimensions/time.h>
+#include <units/isq/dimensions/energy.h>
+#include <units/isq/dimensions/time.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_energy> E, DimensionOfT<dim_time> T>
 struct dim_power : derived_dimension<Child, U, exponent<E, 1>, exponent<T, -1>> {};
@@ -34,4 +34,4 @@ struct dim_power : derived_dimension<Child, U, exponent<E, 1>, exponent<T, -1>>
 template<typename T>
 concept Power = QuantityOfT<T, dim_power>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -22,11 +22,11 @@

 #pragma once

-#include <units/physical/dimensions/area.h>
+#include <units/isq/dimensions/area.h>
 #include <units/concepts.h>
-#include <units/physical/dimensions/force.h>
+#include <units/isq/dimensions/force.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_force> F, DimensionOfT<dim_area> A>
 struct dim_pressure : derived_dimension<Child, U, exponent<F, 1>, exponent<A, -1>> {};
@@ -34,4 +34,4 @@ struct dim_pressure : derived_dimension<Child, U, exponent<F, 1>, exponent<A, -1
 template<typename T>
 concept Pressure = QuantityOfT<T, dim_pressure>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,9 +23,9 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/time.h>
+#include <units/isq/dimensions/time.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_time> T>
 struct dim_radioactivity : derived_dimension<Child, U, exponent<T, -1>> {};
@@ -33,4 +33,4 @@ struct dim_radioactivity : derived_dimension<Child, U, exponent<T, -1>> {};
 template<typename T>
 concept Radioactivity = QuantityOfT<T, dim_radioactivity>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/electric_current.h>
-#include <units/physical/dimensions/voltage.h>
+#include <units/isq/dimensions/electric_current.h>
+#include <units/isq/dimensions/voltage.h>

-namespace units::physical {
+namespace units::isq {

 template <typename Child, Unit U, DimensionOfT<dim_voltage> V, DimensionOfT<dim_electric_current> C>
 struct dim_resistance : derived_dimension<Child,U, exponent<V, 1>, exponent<C, -1>> {};
@@ -34,4 +34,4 @@ struct dim_resistance : derived_dimension<Child,U, exponent<V, 1>, exponent<C, -
 template<typename T>
 concept Resistance = QuantityOfT<T, dim_resistance>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/length.h>
-#include <units/physical/dimensions/time.h>
+#include <units/isq/dimensions/length.h>
+#include <units/isq/dimensions/time.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_length> L, DimensionOfT<dim_time> T>
 struct dim_speed : derived_dimension<Child, U, exponent<L, 1>, exponent<T, -1>> {};
@@ -34,4 +34,4 @@ struct dim_speed : derived_dimension<Child, U, exponent<L, 1>, exponent<T, -1>>
 template<typename T>
 concept Speed = QuantityOfT<T, dim_speed>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/force.h>
-#include <units/physical/dimensions/length.h>
+#include <units/isq/dimensions/force.h>
+#include <units/isq/dimensions/length.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_force> F, DimensionOfT<dim_length> L>
 struct dim_surface_tension : derived_dimension<Child, U, exponent<F, 1>, exponent<L, -1>> {};
@@ -34,4 +34,4 @@ struct dim_surface_tension : derived_dimension<Child, U, exponent<F, 1>, exponen
 template<typename T>
 concept SurfaceTension = QuantityOfT<T, dim_surface_tension>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,11 +23,11 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/length.h>
-#include <units/physical/dimensions/power.h>
-#include <units/physical/dimensions/thermodynamic_temperature.h>
+#include <units/isq/dimensions/length.h>
+#include <units/isq/dimensions/power.h>
+#include <units/isq/dimensions/thermodynamic_temperature.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_power> P, DimensionOfT<dim_length> L, DimensionOfT<dim_thermodynamic_temperature> T>
 struct dim_thermal_conductivity : derived_dimension<Child, U, exponent<P, 1>, exponent<L, -1>, exponent<T, -1>> {};
@@ -35,4 +35,4 @@ struct dim_thermal_conductivity : derived_dimension<Child, U, exponent<P, 1>, ex
 template<typename T>
 concept ThermalConductivity = QuantityOfT<T, dim_thermal_conductivity>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -24,7 +24,7 @@

 #include <units/concepts.h>

-namespace units::physical {
+namespace units::isq {

 template<Unit U>
 struct dim_thermodynamic_temperature : base_dimension<"Θ", U> {};
@@ -32,4 +32,4 @@ struct dim_thermodynamic_temperature : base_dimension<"Θ", U> {};
 template<typename T>
 concept ThermodynamicTemperature = QuantityOfT<T, dim_thermodynamic_temperature>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -24,7 +24,7 @@

 #include <units/concepts.h>

-namespace units::physical {
+namespace units::isq {

 template<Unit U>
 struct dim_time : base_dimension<"T", U> {};
@@ -32,4 +32,4 @@ struct dim_time : base_dimension<"T", U> {};
 template<typename T>
 concept Time = QuantityOfT<T, dim_time>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -24,9 +24,9 @@

 #include <units/generic/angle.h>
 #include <units/concepts.h>
-#include <units/physical/dimensions/energy.h>
+#include <units/isq/dimensions/energy.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_force> F, DimensionOfT<dim_length> L, DimensionOfT<dim_angle> A>
 struct dim_torque : derived_dimension<Child, U, exponent<F, 1>, exponent<L, 1>, exponent<A, -1>> {};
@@ -34,4 +34,4 @@ struct dim_torque : derived_dimension<Child, U, exponent<F, 1>, exponent<L, 1>,
 template<typename T>
 concept Torque = QuantityOfT<T, dim_torque>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,10 +23,10 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/electric_current.h>
-#include <units/physical/dimensions/power.h>
+#include <units/isq/dimensions/electric_current.h>
+#include <units/isq/dimensions/power.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_power> P, DimensionOfT<dim_electric_current> C>
 struct dim_voltage : derived_dimension<Child, U, exponent<P, 1>, exponent<C, -1>> {};
@@ -34,4 +34,4 @@ struct dim_voltage : derived_dimension<Child, U, exponent<P, 1>, exponent<C, -1>
 template<typename T>
 concept Voltage = QuantityOfT<T, dim_voltage>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -23,9 +23,9 @@
 #pragma once

 #include <units/concepts.h>
-#include <units/physical/dimensions/length.h>
+#include <units/isq/dimensions/length.h>

-namespace units::physical {
+namespace units::isq {

 template<typename Child, Unit U, DimensionOfT<dim_length> L>
 struct dim_volume : derived_dimension<Child, U, exponent<L, 3>> {};
@@ -33,4 +33,4 @@ struct dim_volume : derived_dimension<Child, U, exponent<L, 3>> {};
 template<typename T>
 concept Volume = QuantityOfT<T, dim_volume>;

-}  // namespace units::physical
+}  // namespace units::isq
@@ -22,45 +22,45 @@

 #pragma once

-#include <units/physical/dimensions.h>
-#include <units/physical/natural/bits/units.h>
+#include <units/isq/dimensions.h>
+#include <units/isq/natural/bits/units.h>
 #include <units/quantity.h>

-namespace units::physical::natural {
+namespace units::isq::natural {

-struct dim_length : physical::dim_length<inverted_gigaelectronvolt> {};
+struct dim_length : isq::dim_length<inverted_gigaelectronvolt> {};
 template<UnitOf<dim_length> U, QuantityValue Rep = double>
 using length = quantity<dim_length, U, Rep>;

-struct dim_time : physical::dim_time<inverted_gigaelectronvolt> {};
+struct dim_time : isq::dim_time<inverted_gigaelectronvolt> {};
 template<UnitOf<dim_time> U, QuantityValue Rep = double>
 using time = quantity<dim_time, U, Rep>;

-struct dim_mass : physical::dim_mass<gigaelectronvolt> {};
+struct dim_mass : isq::dim_mass<gigaelectronvolt> {};
 template<UnitOf<dim_mass> U, QuantityValue Rep = double>
 using mass = quantity<dim_mass, U, Rep>;

-struct dim_speed : physical::dim_speed<dim_speed, one, dim_length, dim_time> {};
+struct dim_speed : isq::dim_speed<dim_speed, one, dim_length, dim_time> {};
 template<UnitOf<dim_speed> U, QuantityValue Rep = double>
 using speed = quantity<dim_speed, U, Rep>;

-struct dim_acceleration : physical::dim_acceleration<dim_acceleration, gigaelectronvolt, dim_length, dim_time> {};
+struct dim_acceleration : isq::dim_acceleration<dim_acceleration, gigaelectronvolt, dim_length, dim_time> {};
 template<UnitOf<dim_acceleration> U, QuantityValue Rep = double>
 using acceleration = quantity<dim_acceleration, U, Rep>;

-struct dim_force : physical::dim_force<dim_force, square_gigaelectronvolt, dim_mass, dim_acceleration> {};
+struct dim_force : isq::dim_force<dim_force, square_gigaelectronvolt, dim_mass, dim_acceleration> {};
 template<UnitOf<dim_force> U, QuantityValue Rep = double>
 using force = quantity<dim_force, U, Rep>;

-struct dim_momentum : physical::dim_momentum<dim_momentum, gigaelectronvolt, dim_mass, dim_speed> {};
+struct dim_momentum : isq::dim_momentum<dim_momentum, gigaelectronvolt, dim_mass, dim_speed> {};
 template<UnitOf<dim_momentum> U, QuantityValue Rep = double>
 using momentum = quantity<dim_momentum, U, Rep>;

-struct dim_energy : physical::dim_energy<dim_energy, gigaelectronvolt, dim_force, dim_length> {};
+struct dim_energy : isq::dim_energy<dim_energy, gigaelectronvolt, dim_force, dim_length> {};
 template<UnitOf<dim_force> U, QuantityValue Rep = double>
 using energy = quantity<dim_force, U, Rep>;

 // Typical UDLs will not work here as the same units are reused by many quantities.
 // Should we define some strange ones (i.e. _q_mass_GeV)?

-}  // namespace units::physical::natural
+}  // namespace units::isq::natural
@@ -23,9 +23,9 @@
 #pragma once

 #include <units/unit.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/si/prefixes.h>

-namespace units::physical::natural {
+namespace units::isq::natural {

 struct electronvolt : named_unit<electronvolt, "eV", si::prefix> {};
 struct gigaelectronvolt : prefixed_unit<gigaelectronvolt, si::giga, electronvolt> {};
@@ -37,4 +37,4 @@ struct square_gigaelectronvolt : named_unit<square_gigaelectronvolt, basic_symbo
 // natural units as an isolated island with ev = 1 which simplifies all
 // the maths a lot?

-}  // namespace units::physical::natural
+}  // namespace units::isq::natural
@@ -22,11 +22,11 @@

 #pragma once

-#include <units/physical/natural/bits/dimensions.h>
+#include <units/isq/natural/bits/dimensions.h>

-namespace units::physical::natural {
+namespace units::isq::natural {

 template<QuantityValue Rep = double>
 inline constexpr auto speed_of_light = speed<one, Rep>(1);

-}  // namespace units::physical::natural
+}  // namespace units::isq::natural
@@ -22,12 +22,12 @@

 #pragma once

-#include <units/physical/dimensions/absorbed_dose.h>
-#include <units/physical/si/energy.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/absorbed_dose.h>
+#include <units/isq/si/energy.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct gray : named_unit<gray, "Gy", prefix> {};
 struct yoctogray : prefixed_unit<yoctogray, yocto, gray> {};
@@ -51,7 +51,7 @@ struct exagray : prefixed_unit<exagray, exa, gray> {};
 struct zettagray : prefixed_unit<zettagray, zetta, gray> {};
 struct yottagray : prefixed_unit<yottagray, yotta, gray> {};

-struct dim_absorbed_dose : physical::dim_absorbed_dose<dim_absorbed_dose, gray, dim_energy, dim_mass> {};
+struct dim_absorbed_dose : isq::dim_absorbed_dose<dim_absorbed_dose, gray, dim_energy, dim_mass> {};

 template<UnitOf<dim_absorbed_dose> U, QuantityValue Rep = double>
 using absorbed_dose = quantity<dim_absorbed_dose, U, Rep>;
@@ -170,4 +170,4 @@ inline constexpr auto YGy = absorbed_dose<yottagray, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,14 +22,14 @@

 #pragma once

-#include <units/physical/dimensions/acceleration.h>
-#include <units/physical/si/speed.h>
+#include <units/isq/dimensions/acceleration.h>
+#include <units/isq/si/speed.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct metre_per_second_sq : unit<metre_per_second_sq> {};
-struct dim_acceleration : physical::dim_acceleration<dim_acceleration, metre_per_second_sq, dim_length, dim_time> {};
+struct dim_acceleration : isq::dim_acceleration<dim_acceleration, metre_per_second_sq, dim_length, dim_time> {};

 template<UnitOf<dim_acceleration> U, QuantityValue Rep = double>
 using acceleration = quantity<dim_acceleration, U, Rep>;
@@ -42,4 +42,4 @@ constexpr auto operator"" _q_m_per_s2(long double l) { return acceleration<metre

 }  // namespace literals

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -23,15 +23,15 @@
 #pragma once

 #include <units/one_rep.h>
-#include <units/physical/dimensions/amount_of_substance.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/amount_of_substance.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct mole : named_unit<mole, "mol", prefix> {};

-struct dim_amount_of_substance : physical::dim_amount_of_substance<mole> {};
+struct dim_amount_of_substance : isq::dim_amount_of_substance<mole> {};

 template<UnitOf<dim_amount_of_substance> U, QuantityValue Rep = double>
 using amount_of_substance = quantity<dim_amount_of_substance, U, Rep>;
@@ -50,4 +50,4 @@ inline constexpr auto mol = amount_of_substance<mole, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,17 +22,17 @@

 #pragma once

-#include <units/physical/dimensions/angular_velocity.h>
+#include <units/isq/dimensions/angular_velocity.h>
 #include <units/generic/angle.h>
-#include <units/physical/si/time.h>
+#include <units/isq/si/time.h>

 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct radian_per_second : named_unit<radian_per_second, basic_symbol_text{"ω", "w"}, no_prefix> {};

-struct dim_angular_velocity : physical::dim_angular_velocity<dim_angular_velocity, radian_per_second, dim_angle<>, dim_time> {};
+struct dim_angular_velocity : isq::dim_angular_velocity<dim_angular_velocity, radian_per_second, dim_angle<>, dim_time> {};

 template<UnitOf<dim_angular_velocity> U, QuantityValue Rep = double>
 using angular_velocity = quantity<dim_angular_velocity, U, Rep>;
@@ -45,4 +45,4 @@ constexpr auto operator"" _q_rad_per_s(long double l) { return angular_velocity<

 }  // namespace literals

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,14 +22,14 @@

 #pragma once

-#include <units/physical/dimensions/area.h>
-#include <units/physical/si/length.h>
+#include <units/isq/dimensions/area.h>
+#include <units/isq/si/length.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct square_metre : unit<square_metre> {};
-struct dim_area : physical::dim_area<dim_area, square_metre, dim_length> {};
+struct dim_area : isq::dim_area<dim_area, square_metre, dim_length> {};

 struct square_yoctometre : deduced_unit<square_yoctometre, dim_area, yoctometre> {};
 struct square_zeptometre : deduced_unit<square_zeptometre, dim_area, zeptometre> {};
@@ -176,4 +176,4 @@ inline constexpr auto ha = area<hectare, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,13 +22,13 @@

 #pragma once

-#include <units/physical/dimensions/capacitance.h>
-#include <units/physical/si/electric_charge.h>
-#include <units/physical/si/voltage.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/capacitance.h>
+#include <units/isq/si/electric_charge.h>
+#include <units/isq/si/voltage.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct farad : named_unit<farad, "F", prefix> {};
 struct yoctofarad : prefixed_unit<yoctofarad, yocto, farad> {};
@@ -52,7 +52,7 @@ struct exafarad : prefixed_unit<exafarad, exa, farad> {};
 struct zettafarad : prefixed_unit<zettafarad, zetta, farad> {};
 struct yottafarad : prefixed_unit<yottafarad, yotta, farad> {};

-struct dim_capacitance : physical::dim_capacitance<dim_capacitance, farad, dim_electric_charge, dim_voltage> {};
+struct dim_capacitance : isq::dim_capacitance<dim_capacitance, farad, dim_electric_charge, dim_voltage> {};

 template<UnitOf<dim_capacitance> U, QuantityValue Rep = double>
 using capacitance = quantity<dim_capacitance, U, Rep>;
@@ -171,4 +171,4 @@ inline constexpr auto YF = capacitance<yottafarad, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,13 +22,13 @@

 #pragma once

-#include <units/physical/dimensions/catalytic_activity.h>
-#include <units/physical/si/amount_of_substance.h>
-#include <units/physical/si/time.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/catalytic_activity.h>
+#include <units/isq/si/amount_of_substance.h>
+#include <units/isq/si/time.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct katal : named_unit<katal, "kat", prefix> {};
 struct yoctokatal : prefixed_unit<yoctokatal, yocto, katal> {};
@@ -54,7 +54,7 @@ struct yottakatal : prefixed_unit<yottakatal, yotta, katal> {};

 struct enzyme_unit : named_scaled_unit<enzyme_unit, "U", prefix, ratio(1, 60, -6), katal> {};

-struct dim_catalytic_activity : physical::dim_catalytic_activity<dim_catalytic_activity, katal, dim_time, dim_amount_of_substance> {};
+struct dim_catalytic_activity : isq::dim_catalytic_activity<dim_catalytic_activity, katal, dim_time, dim_amount_of_substance> {};

 template<UnitOf<dim_catalytic_activity> U, QuantityValue Rep = double>
 using catalytic_activity = quantity<dim_catalytic_activity, U, Rep>;
@@ -178,5 +178,5 @@ inline constexpr auto U = catalytic_activity<enzyme_unit, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si
+}  // namespace units::isq::si

@@ -22,14 +22,14 @@

 #pragma once

-#include <units/physical/dimensions/acceleration.h>
-#include <units/physical/si/cgs/speed.h>
+#include <units/isq/dimensions/acceleration.h>
+#include <units/isq/si/cgs/speed.h>
 #include <units/quantity.h>

-namespace units::physical::si::cgs {
+namespace units::isq::si::cgs {

 struct gal : named_unit<gal, "Gal", si::prefix> {};
-struct dim_acceleration : physical::dim_acceleration<dim_acceleration, gal, dim_length, dim_time> {};
+struct dim_acceleration : isq::dim_acceleration<dim_acceleration, gal, dim_length, dim_time> {};

 template<UnitOf<dim_acceleration> U, QuantityValue Rep = double>
 using acceleration = quantity<dim_acceleration, U, Rep>;
@@ -48,4 +48,4 @@ inline constexpr auto Gal = acceleration<gal, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::cgs
+}  // namespace units::isq::si::cgs
@@ -22,15 +22,15 @@

 #pragma once

-#include <units/physical/si/area.h>
-#include <units/physical/si/cgs/length.h>
+#include <units/isq/si/area.h>
+#include <units/isq/si/cgs/length.h>
 #include <units/quantity.h>

-namespace units::physical::si::cgs {
+namespace units::isq::si::cgs {

 using si::square_centimetre;

-struct dim_area : physical::dim_area<dim_area, square_centimetre, dim_length> {};
+struct dim_area : isq::dim_area<dim_area, square_centimetre, dim_length> {};

 template<UnitOf<dim_area> U, QuantityValue Rep = double>
 using area = quantity<dim_area, U, Rep>;
@@ -49,4 +49,4 @@ inline constexpr auto cm2 = area<square_centimetre, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::cgs
+}  // namespace units::isq::si::cgs
@@ -0,0 +1,35 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2018 Mateusz Pusz
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#pragma once
+
+#include <units/isq/si/cgs/length.h>
+#include <units/isq/si/cgs/mass.h>
+#include <units/isq/si/cgs/time.h>
+
+#include <units/isq/si/cgs/acceleration.h>
+#include <units/isq/si/cgs/area.h>
+#include <units/isq/si/cgs/energy.h>
+#include <units/isq/si/cgs/force.h>
+#include <units/isq/si/cgs/power.h>
+#include <units/isq/si/cgs/pressure.h>
+#include <units/isq/si/cgs/speed.h>
@@ -22,16 +22,16 @@

 #pragma once

-#include <units/physical/dimensions/energy.h>
-#include <units/physical/si/cgs/force.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/energy.h>
+#include <units/isq/si/cgs/force.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si::cgs {
+namespace units::isq::si::cgs {

 struct erg : named_unit<erg, "erg", si::prefix> {};

-struct dim_energy : physical::dim_energy<dim_energy, erg, dim_force, dim_length> {};
+struct dim_energy : isq::dim_energy<dim_energy, erg, dim_force, dim_length> {};

 template<UnitOf<dim_energy> U, QuantityValue Rep = double>
 using energy = quantity<dim_energy, U, Rep>;
@@ -50,4 +50,4 @@ inline constexpr auto erg = energy<cgs::erg, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::cgs
+}  // namespace units::isq::si::cgs
@@ -22,17 +22,17 @@

 #pragma once

-#include <units/physical/dimensions/force.h>
-#include <units/physical/si/cgs/acceleration.h>
-#include <units/physical/si/cgs/mass.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/force.h>
+#include <units/isq/si/cgs/acceleration.h>
+#include <units/isq/si/cgs/mass.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si::cgs {
+namespace units::isq::si::cgs {

 struct dyne : named_unit<dyne, "dyn", si::prefix> {};

-struct dim_force : physical::dim_force<dim_force, dyne, dim_mass, dim_acceleration> {};
+struct dim_force : isq::dim_force<dim_force, dyne, dim_mass, dim_acceleration> {};

 template<UnitOf<dim_force> U, QuantityValue Rep = double>
 using force = quantity<dim_force, U, Rep>;
@@ -51,4 +51,4 @@ inline constexpr auto dyn = force<dyne, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::cgs
+}  // namespace units::isq::si::cgs
@@ -22,14 +22,14 @@

 #pragma once

-#include <units/physical/si/length.h>
+#include <units/isq/si/length.h>
 #include <units/quantity.h>

-namespace units::physical::si::cgs {
+namespace units::isq::si::cgs {

 using si::centimetre;

-struct dim_length : physical::dim_length<centimetre> {};
+struct dim_length : isq::dim_length<centimetre> {};

 template<UnitOf<dim_length> U, QuantityValue Rep = double>
 using length = quantity<dim_length, U, Rep>;
@@ -48,4 +48,4 @@ inline constexpr auto cm = length<centimetre, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::cgs
+}  // namespace units::isq::si::cgs
@@ -22,14 +22,14 @@

 #pragma once

-#include <units/physical/si/mass.h>
+#include <units/isq/si/mass.h>
 #include <units/quantity.h>

-namespace units::physical::si::cgs {
+namespace units::isq::si::cgs {

 using si::gram;

-struct dim_mass : physical::dim_mass<gram> {};
+struct dim_mass : isq::dim_mass<gram> {};

 template<UnitOf<dim_mass> U, QuantityValue Rep = double>
 using mass = quantity<dim_mass, U, Rep>;
@@ -48,4 +48,4 @@ inline constexpr auto g = mass<gram, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::cgs
+}  // namespace units::isq::si::cgs
@@ -22,16 +22,16 @@

 #pragma once

-#include <units/physical/dimensions/power.h>
-#include <units/physical/si/cgs/energy.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/power.h>
+#include <units/isq/si/cgs/energy.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si::cgs {
+namespace units::isq::si::cgs {

 struct erg_per_second : unit<erg_per_second> {};

-struct dim_power : physical::dim_power<dim_power, erg_per_second, dim_energy, dim_time> {};
+struct dim_power : isq::dim_power<dim_power, erg_per_second, dim_energy, dim_time> {};

 template<UnitOf<dim_power> U, QuantityValue Rep = double>
 using power = quantity<dim_power, U, Rep>;
@@ -44,4 +44,4 @@ constexpr auto operator"" _q_erg_per_s(long double l) { return power<erg_per_sec

 }  // namespace literals

-}  // namespace units::physical::si::cgs
+}  // namespace units::isq::si::cgs
@@ -22,17 +22,17 @@

 #pragma once

-#include <units/physical/dimensions/pressure.h>
-#include <units/physical/si/cgs/area.h>
-#include <units/physical/si/cgs/force.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/pressure.h>
+#include <units/isq/si/cgs/area.h>
+#include <units/isq/si/cgs/force.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si::cgs {
+namespace units::isq::si::cgs {

 struct barye : named_unit<barye, "Ba", si::prefix> {};

-struct dim_pressure : physical::dim_pressure<dim_pressure, barye, dim_force, dim_area> {};
+struct dim_pressure : isq::dim_pressure<dim_pressure, barye, dim_force, dim_area> {};

 template<UnitOf<dim_pressure> U, QuantityValue Rep = double>
 using pressure = quantity<dim_pressure, U, Rep>;
@@ -51,4 +51,4 @@ inline constexpr auto Ba = pressure<barye, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::cgs
+}  // namespace units::isq::si::cgs
@@ -22,15 +22,15 @@

 #pragma once

-#include <units/physical/dimensions/speed.h>
-#include <units/physical/si/cgs/length.h>
-#include <units/physical/si/cgs/time.h>
+#include <units/isq/dimensions/speed.h>
+#include <units/isq/si/cgs/length.h>
+#include <units/isq/si/cgs/time.h>
 #include <units/quantity.h>

-namespace units::physical::si::cgs {
+namespace units::isq::si::cgs {

 struct centimetre_per_second : unit<centimetre_per_second> {};
-struct dim_speed : physical::dim_speed<dim_speed, centimetre_per_second, dim_length, dim_time> {};
+struct dim_speed : isq::dim_speed<dim_speed, centimetre_per_second, dim_length, dim_time> {};

 template<UnitOf<dim_speed> U, QuantityValue Rep = double>
 using speed = quantity<dim_speed, U, Rep>;
@@ -43,4 +43,4 @@ constexpr auto operator"" _q_cm_per_s(long double l) { return speed<centimetre_p

 }  // namespace literals

-}  // namespace units::physical::si::cgs
+}  // namespace units::isq::si::cgs
@@ -22,10 +22,10 @@

 #pragma once

-#include <units/physical/si/time.h>
+#include <units/isq/si/time.h>
 #include <units/quantity.h>

-namespace units::physical::si::cgs {
+namespace units::isq::si::cgs {

 using si::second;

@@ -44,4 +44,4 @@ using si::unit_constants::s;

 }  // namespace unit_constants

-}  // namespace units::physical::si::cgs
+}  // namespace units::isq::si::cgs
@@ -22,19 +22,19 @@

 #pragma once

-#include <units/physical/dimensions/charge_density.h>
-#include <units/physical/si/electric_charge.h>
-#include <units/physical/si/length.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/charge_density.h>
+#include <units/isq/si/electric_charge.h>
+#include <units/isq/si/length.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct coulomb_per_metre_cub : unit<coulomb_per_metre_cub> {};
 struct coulomb_per_metre_sq : unit<coulomb_per_metre_sq> {};

-struct dim_charge_density : physical::dim_charge_density<dim_charge_density, coulomb_per_metre_cub, dim_electric_charge, dim_length> {};
-struct dim_surface_charge_density : physical::dim_surface_charge_density<dim_surface_charge_density, coulomb_per_metre_sq, dim_electric_charge, dim_length> {};
+struct dim_charge_density : isq::dim_charge_density<dim_charge_density, coulomb_per_metre_cub, dim_electric_charge, dim_length> {};
+struct dim_surface_charge_density : isq::dim_surface_charge_density<dim_surface_charge_density, coulomb_per_metre_sq, dim_electric_charge, dim_length> {};

 template<UnitOf<dim_charge_density> U, QuantityValue Rep = double>
 using charge_density = quantity<dim_charge_density, U, Rep>;
@@ -54,4 +54,4 @@ constexpr auto operator"" _q_C_per_m2(long double l) { return surface_charge_den

 }  // namespace literals

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,15 +22,15 @@

 #pragma once

-#include <units/physical/dimensions/concentration.h>
-#include <units/physical/si/length.h>
-#include <units/physical/si/amount_of_substance.h>
+#include <units/isq/dimensions/concentration.h>
+#include <units/isq/si/length.h>
+#include <units/isq/si/amount_of_substance.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct mol_per_metre_cub : unit<mol_per_metre_cub> {};
-struct dim_concentration : physical::dim_concentration<dim_concentration, mol_per_metre_cub, dim_amount_of_substance, dim_length> {};
+struct dim_concentration : isq::dim_concentration<dim_concentration, mol_per_metre_cub, dim_amount_of_substance, dim_length> {};

 template<UnitOf<dim_concentration> U, QuantityValue Rep = double>
 using concentration = quantity<dim_concentration, U, Rep>;
@@ -43,5 +43,5 @@ constexpr auto operator"" _q_mol_per_m3(long double l) { return concentration<mo

 }  // namespace literals

-}  // namespace units::physical::si
+}  // namespace units::isq::si

@@ -22,12 +22,12 @@

 #pragma once

-#include <units/physical/dimensions/conductance.h>
-#include <units/physical/si/resistance.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/conductance.h>
+#include <units/isq/si/resistance.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct siemens : named_unit<siemens, "S", prefix> {};
 struct yoctosiemens : prefixed_unit<yoctosiemens, yocto, siemens> {};
@@ -47,7 +47,7 @@ struct exasiemens : prefixed_unit<exasiemens, exa, siemens> {};
 struct zettasiemens : prefixed_unit<zettasiemens, zetta, siemens> {};
 struct yottasiemens : prefixed_unit<yottasiemens, yotta, siemens> {};

-struct dim_conductance : physical::dim_conductance<dim_conductance, siemens, dim_resistance> {};
+struct dim_conductance : isq::dim_conductance<dim_conductance, siemens, dim_resistance> {};

 template<UnitOf<dim_conductance> U, QuantityValue Rep = double>
 using conductance = quantity<dim_conductance, U, Rep>;
@@ -146,5 +146,5 @@ inline constexpr auto YS = conductance<yottasiemens, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si
+}  // namespace units::isq::si

@@ -22,15 +22,15 @@

 #pragma once

-#include <units/physical/si/amount_of_substance.h>
-#include <units/physical/si/thermodynamic_temperature.h>
-#include <units/physical/si/electric_charge.h>
-#include <units/physical/si/energy.h>
-#include <units/physical/si/frequency.h>
-#include <units/physical/si/power.h>
-#include <units/physical/si/speed.h>
+#include <units/isq/si/amount_of_substance.h>
+#include <units/isq/si/thermodynamic_temperature.h>
+#include <units/isq/si/electric_charge.h>
+#include <units/isq/si/energy.h>
+#include <units/isq/si/frequency.h>
+#include <units/isq/si/power.h>
+#include <units/isq/si/speed.h>

-namespace units::physical::si::si2019 {
+namespace units::isq::si::si2019 {

 template<QuantityValue Rep = double>
 inline constexpr auto planck_constant = energy<joule, Rep>(6.62607015e-34) * time<second, Rep>(1);
@@ -59,4 +59,4 @@ inline constexpr auto hyperfine_structure_transition_frequency = frequency<hertz
 template<QuantityValue Rep = double>
 inline constexpr auto standard_gravity = acceleration<metre_per_second_sq, Rep>(9.80665);

-}  // namespace units::physical::si::si2019
+}  // namespace units::isq::si::si2019
@@ -22,17 +22,17 @@

 #pragma once

-#include <units/physical/dimensions/current_density.h>
-#include <units/physical/si/electric_current.h>
-#include <units/physical/si/length.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/current_density.h>
+#include <units/isq/si/electric_current.h>
+#include <units/isq/si/length.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct ampere_per_metre_sq : unit<ampere_per_metre_sq> {};

-struct dim_current_density : physical::dim_current_density<dim_current_density, ampere_per_metre_sq, dim_electric_current, dim_length> {};
+struct dim_current_density : isq::dim_current_density<dim_current_density, ampere_per_metre_sq, dim_electric_current, dim_length> {};

 template<UnitOf<dim_current_density> U, QuantityValue Rep = double>
 using current_density = quantity<dim_current_density, U, Rep>;
@@ -45,4 +45,4 @@ constexpr auto operator"" _q_A_per_m2(long double l) { return current_density<am

 }  // namespace literals

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,17 +22,17 @@

 #pragma once

-#include <units/physical/dimensions/density.h>
-#include <units/physical/si/mass.h>
-#include <units/physical/si/length.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/density.h>
+#include <units/isq/si/mass.h>
+#include <units/isq/si/length.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct kilogram_per_metre_cub : unit<kilogram_per_metre_cub> {};

-struct dim_density : physical::dim_density<dim_density, kilogram_per_metre_cub, dim_mass, dim_length> {};
+struct dim_density : isq::dim_density<dim_density, kilogram_per_metre_cub, dim_mass, dim_length> {};

 template<UnitOf<dim_density> U, QuantityValue Rep = double>
 using density = quantity<dim_density, U, Rep>;
@@ -45,4 +45,4 @@ constexpr auto operator"" _q_kg_per_m3(long double l) { return density<kilogram_

 }  // namespace literals

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,15 +22,15 @@

 #pragma once

-#include <units/physical/dimensions/dynamic_viscosity.h>
-#include <units/physical/si/time.h>
-#include <units/physical/si/pressure.h>
+#include <units/isq/dimensions/dynamic_viscosity.h>
+#include <units/isq/si/time.h>
+#include <units/isq/si/pressure.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct pascal_second : unit<pascal_second> {};
-struct dim_dynamic_viscosity : physical::dim_dynamic_viscosity<dim_dynamic_viscosity, pascal_second, dim_pressure, dim_time> {};
+struct dim_dynamic_viscosity : isq::dim_dynamic_viscosity<dim_dynamic_viscosity, pascal_second, dim_pressure, dim_time> {};

 template<UnitOf<dim_dynamic_viscosity> U, QuantityValue Rep = double>
 using dynamic_viscosity = quantity<dim_dynamic_viscosity, U, Rep>;
@@ -49,5 +49,5 @@ inline constexpr auto Pa_s = dynamic_viscosity<pascal_second, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si
+}  // namespace units::isq::si

@@ -22,16 +22,16 @@

 #pragma once

-#include <units/physical/dimensions/electric_charge.h>
-#include <units/physical/si/electric_current.h>
-#include <units/physical/si/time.h>
+#include <units/isq/dimensions/electric_charge.h>
+#include <units/isq/si/electric_current.h>
+#include <units/isq/si/time.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct coulomb : named_unit<coulomb, "C", prefix> {};

-struct dim_electric_charge : physical::dim_electric_charge<dim_electric_charge, coulomb, dim_time, dim_electric_current> {};
+struct dim_electric_charge : isq::dim_electric_charge<dim_electric_charge, coulomb, dim_time, dim_electric_current> {};

 template<UnitOf<dim_electric_charge> U, QuantityValue Rep = double>
 using electric_charge = quantity<dim_electric_charge, U, Rep>;
@@ -50,4 +50,4 @@ inline constexpr auto C = electric_charge<coulomb, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -23,11 +23,11 @@
 #pragma once

 #include <units/one_rep.h>
-#include <units/physical/dimensions/electric_current.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/electric_current.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct ampere : named_unit<ampere, "A", prefix> {};
 struct yoctoampere : prefixed_unit<yoctoampere, yocto, ampere> {};
@@ -51,7 +51,7 @@ struct exaampere : prefixed_unit<exaampere, exa, ampere> {};
 struct zettaampere : prefixed_unit<zettaampere, zetta, ampere> {};
 struct yottaampere : prefixed_unit<yottaampere, yotta, ampere> {};

-struct dim_electric_current : physical::dim_electric_current<ampere> {};
+struct dim_electric_current : isq::dim_electric_current<ampere> {};

 template<UnitOf<dim_electric_current> U, QuantityValue Rep = double>
 using electric_current = quantity<dim_electric_current, U, Rep>;
@@ -170,4 +170,4 @@ inline constexpr auto YA = electric_current<yottaampere, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,14 +22,14 @@

 #pragma once

-#include <units/physical/dimensions/electric_field_strength.h>
-#include <units/physical/si/voltage.h>
+#include <units/isq/dimensions/electric_field_strength.h>
+#include <units/isq/si/voltage.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct volt_per_metre : unit<volt_per_metre> {};
-struct dim_electric_field_strength : physical::dim_electric_field_strength<dim_electric_field_strength, volt_per_metre, dim_voltage, dim_length> {};
+struct dim_electric_field_strength : isq::dim_electric_field_strength<dim_electric_field_strength, volt_per_metre, dim_voltage, dim_length> {};

 template<UnitOf<dim_electric_field_strength> U, QuantityValue Rep = double>
 using electric_field_strength = quantity<dim_electric_field_strength, U, Rep>;
@@ -42,4 +42,4 @@ constexpr auto operator"" _q_V_per_m(long double l) { return electric_field_stre

 }  // namespace literals

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,12 +22,12 @@

 #pragma once

-#include <units/physical/dimensions/energy.h>
-#include <units/physical/si/force.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/energy.h>
+#include <units/isq/si/force.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct joule : named_unit<joule, "J", prefix> {};
 struct yoctojoule : prefixed_unit<yoctojoule, yocto, joule> {};
@@ -50,7 +50,7 @@ struct yottajoule : prefixed_unit<yottajoule, yotta, joule> {};
 struct electronvolt : named_scaled_unit<electronvolt, "eV", prefix, ratio(1'602'176'634, 1'000'000'000, -19), joule> {};
 struct gigaelectronvolt : prefixed_unit<gigaelectronvolt, giga, electronvolt> {};

-struct dim_energy : physical::dim_energy<dim_energy, joule, dim_force, dim_length> {};
+struct dim_energy : isq::dim_energy<dim_energy, joule, dim_force, dim_length> {};

 template<UnitOf<dim_energy> U, QuantityValue Rep = double>
 using energy = quantity<dim_energy, U, Rep>;
@@ -159,4 +159,4 @@ inline constexpr auto GeV = energy<gigaelectronvolt, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,15 +22,15 @@

 #pragma once

-#include <units/physical/dimensions/energy_density.h>
-#include <units/physical/si/energy.h>
-#include <units/physical/si/volume.h>
+#include <units/isq/dimensions/energy_density.h>
+#include <units/isq/si/energy.h>
+#include <units/isq/si/volume.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct joule_per_metre_cub : unit<joule_per_metre_cub> {};
-struct dim_energy_density : physical::dim_energy_density<dim_energy_density, joule_per_metre_cub, dim_energy, dim_volume> {};
+struct dim_energy_density : isq::dim_energy_density<dim_energy_density, joule_per_metre_cub, dim_energy, dim_volume> {};

 template<UnitOf<dim_energy_density> U, QuantityValue Rep = double>
 using energy_density = quantity<dim_energy_density, U, Rep>;
@@ -43,4 +43,4 @@ constexpr auto operator"" _q_J_per_m3(long double l) { return energy_density<jou

 }  // namespace literals

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,13 +22,13 @@

 #pragma once

-#include <units/physical/dimensions/force.h>
-#include <units/physical/si/acceleration.h>
-#include <units/physical/si/mass.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/force.h>
+#include <units/isq/si/acceleration.h>
+#include <units/isq/si/mass.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct newton : named_unit<newton, "N", prefix> {};
 struct yoctonewton : prefixed_unit<yoctonewton, yocto, newton> {};
@@ -52,7 +52,7 @@ struct exanewton : prefixed_unit<exanewton, exa, newton> {};
 struct zettanewton : prefixed_unit<zettanewton, zetta, newton> {};
 struct yottanewton : prefixed_unit<yottanewton, yotta, newton> {};

-struct dim_force : physical::dim_force<dim_force, newton, dim_mass, dim_acceleration> {};
+struct dim_force : isq::dim_force<dim_force, newton, dim_mass, dim_acceleration> {};

 template<UnitOf<dim_force> U, QuantityValue Rep = double>
 using force = quantity<dim_force, U, Rep>;
@@ -171,4 +171,4 @@ inline constexpr auto YN = force<yottanewton, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,14 +22,14 @@

 #pragma once

-#include <units/physical/dimensions/acceleration.h>
-#include <units/physical/si/fps/speed.h>
+#include <units/isq/dimensions/acceleration.h>
+#include <units/isq/si/fps/speed.h>
 #include <units/quantity.h>

-namespace units::physical::si::fps {
+namespace units::isq::si::fps {

 struct foot_per_second_sq : unit<foot_per_second_sq> {};
-struct dim_acceleration : physical::dim_acceleration<dim_acceleration, foot_per_second_sq, dim_length, dim_time> {};
+struct dim_acceleration : isq::dim_acceleration<dim_acceleration, foot_per_second_sq, dim_length, dim_time> {};

 template<UnitOf<dim_acceleration> U, QuantityValue Rep = double>
 using acceleration = quantity<dim_acceleration, U, Rep>;
@@ -42,4 +42,4 @@ constexpr auto operator"" _q_ft_per_s2(long double l) { return acceleration<foot

 }  // namespace literals

-}  // namespace units::physical::si::fps
+}  // namespace units::isq::si::fps
@@ -22,14 +22,14 @@

 #pragma once

-#include <units/physical/dimensions/area.h>
-#include <units/physical/si/fps/length.h>
+#include <units/isq/dimensions/area.h>
+#include <units/isq/si/fps/length.h>
 #include <units/quantity.h>

-namespace units::physical::si::fps {
+namespace units::isq::si::fps {

 struct square_foot : unit<square_foot> {};
-struct dim_area : physical::dim_area<dim_area, square_foot, dim_length> {};
+struct dim_area : isq::dim_area<dim_area, square_foot, dim_length> {};


 template<UnitOf<dim_area> U, QuantityValue Rep = double>
@@ -49,4 +49,4 @@ inline constexpr auto ft2 = area<square_foot, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::fps
+}  // namespace units::isq::si::fps
@@ -22,16 +22,16 @@

 #pragma once

-#include <units/physical/dimensions/density.h>
-#include <units/physical/si/fps/mass.h>
-#include <units/physical/si/fps/length.h>
+#include <units/isq/dimensions/density.h>
+#include <units/isq/si/fps/mass.h>
+#include <units/isq/si/fps/length.h>
 #include <units/quantity.h>

-namespace units::physical::si::fps {
+namespace units::isq::si::fps {

 struct pound_per_foot_cub : unit<pound_per_foot_cub> {};

-struct dim_density : physical::dim_density<dim_density, pound_per_foot_cub, dim_mass, dim_length> {};
+struct dim_density : isq::dim_density<dim_density, pound_per_foot_cub, dim_mass, dim_length> {};

 template<UnitOf<dim_density> U, QuantityValue Rep = double>
 using density = quantity<dim_density, U, Rep>;
@@ -44,4 +44,4 @@ constexpr auto operator"" _q_lb_per_ft3(long double l) { return density<pound_pe

 }  // namespace literals

-}  // namespace units::physical::si::fps
+}  // namespace units::isq::si::fps
@@ -22,17 +22,17 @@

 #pragma once

-#include <units/physical/dimensions/energy.h>
-#include <units/physical/si/fps/force.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/energy.h>
+#include <units/isq/si/fps/force.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si::fps {
+namespace units::isq::si::fps {

 // https://en.wikipedia.org/wiki/Foot-poundal
 struct foot_poundal : unit<foot_poundal> {};

-struct dim_energy : physical::dim_energy<dim_energy, foot_poundal, dim_force, dim_length> {};
+struct dim_energy : isq::dim_energy<dim_energy, foot_poundal, dim_force, dim_length> {};

 // https://en.wikipedia.org/wiki/Foot-pound_(energy)
 struct foot_pound_force : noble_deduced_unit<foot_pound_force, dim_energy, pound_force, foot> {};
@@ -62,4 +62,4 @@ inline constexpr auto ft_lbf = energy<foot_pound_force, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::fps
+}  // namespace units::isq::si::fps
@@ -22,13 +22,13 @@

 #pragma once

-#include <units/physical/dimensions/force.h>
-#include <units/physical/si/fps/acceleration.h>
-#include <units/physical/si/fps/mass.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/force.h>
+#include <units/isq/si/fps/acceleration.h>
+#include <units/isq/si/fps/mass.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si::fps {
+namespace units::isq::si::fps {

 // https://en.wikipedia.org/wiki/Poundal
 struct poundal : named_unit<poundal, "pdl", no_prefix> {};
@@ -41,7 +41,7 @@ struct kilopound_force : prefixed_unit<kilopound_force, si::kilo, pound_force> {
 // https://en.wikipedia.org/wiki/Kip_(unit), 
 struct kip : alias_unit<kilopound_force, "klbf", no_prefix> {};

-struct dim_force : physical::dim_force<dim_force, poundal, dim_mass, dim_acceleration> {};
+struct dim_force : isq::dim_force<dim_force, poundal, dim_mass, dim_acceleration> {};

 template<UnitOf<dim_force> U, QuantityValue Rep = double>
 using force = quantity<dim_force, U, Rep>;
@@ -70,4 +70,4 @@ inline constexpr auto klbf = force<kilopound_force, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::fps
+}  // namespace units::isq::si::fps
@@ -0,0 +1,37 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2018 Mateusz Pusz
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#pragma once
+
+#include <units/isq/si/fps/length.h>
+#include <units/isq/si/fps/mass.h>
+#include <units/isq/si/fps/time.h>
+
+#include <units/isq/si/fps/acceleration.h>
+#include <units/isq/si/fps/area.h>
+#include <units/isq/si/fps/density.h>
+#include <units/isq/si/fps/energy.h>
+#include <units/isq/si/fps/force.h>
+#include <units/isq/si/fps/power.h>
+#include <units/isq/si/fps/pressure.h>
+#include <units/isq/si/fps/speed.h>
+#include <units/isq/si/fps/volume.h>
@@ -22,10 +22,10 @@

 #pragma once

-#include <units/physical/si/length.h>
+#include <units/isq/si/length.h>
 #include <units/quantity.h>

-namespace units::physical::si::fps {
+namespace units::isq::si::fps {

 // https://en.wikipedia.org/wiki/Foot_(unit)
 struct foot : named_scaled_unit<foot, "ft", no_prefix, ratio(3'048, 1'000, -1), si::metre> {};
@@ -49,7 +49,7 @@ struct nautical_mile : named_scaled_unit<nautical_mile, "mi(naut)", no_prefix, r



-struct dim_length : physical::dim_length<foot> {};
+struct dim_length : isq::dim_length<foot> {};

 template<UnitOf<dim_length> U, QuantityValue Rep = double>
 using length = quantity<dim_length, U, Rep>;
@@ -108,4 +108,4 @@ inline constexpr auto naut_mi = length<nautical_mile, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::fps
+}  // namespace units::isq::si::fps
@@ -22,15 +22,15 @@

 #pragma once

-#include <units/physical/si/mass.h>
+#include <units/isq/si/mass.h>
 #include <units/quantity.h>

-namespace units::physical::si::fps {
+namespace units::isq::si::fps {

 // https://en.wikipedia.org/wiki/Pound_(mass)
 struct pound : named_scaled_unit<pound, "lb", no_prefix, ratio(45'359'237, 100'000'000), si::kilogram> {};

-struct dim_mass : physical::dim_mass<pound> {};
+struct dim_mass : isq::dim_mass<pound> {};

 template<UnitOf<dim_mass> U, QuantityValue Rep = double>
 using mass = quantity<dim_mass, U, Rep>;
@@ -105,4 +105,4 @@ inline constexpr auto lton = mass<long_ton, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::fps
+}  // namespace units::isq::si::fps
@@ -22,16 +22,16 @@

 #pragma once

-#include <units/physical/dimensions/power.h>
-#include <units/physical/si/fps/energy.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/power.h>
+#include <units/isq/si/fps/energy.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si::fps {
+namespace units::isq::si::fps {

 struct foot_poundal_per_second : unit<foot_poundal_per_second> {};

-struct dim_power : physical::dim_power<dim_power, foot_poundal_per_second, dim_energy, dim_time> {};
+struct dim_power : isq::dim_power<dim_power, foot_poundal_per_second, dim_energy, dim_time> {};

 struct foot_pound_force_per_second : deduced_unit<foot_pound_force_per_second, dim_power, foot_pound_force, second> {};

@@ -62,4 +62,4 @@ inline constexpr auto hp = power<horse_power, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::fps
+}  // namespace units::isq::si::fps
@@ -22,17 +22,17 @@

 #pragma once

-#include <units/physical/dimensions/pressure.h>
-#include <units/physical/si/fps/area.h>
-#include <units/physical/si/fps/force.h>
-#include <units/physical/si/prefixes.h>
+#include <units/isq/dimensions/pressure.h>
+#include <units/isq/si/fps/area.h>
+#include <units/isq/si/fps/force.h>
+#include <units/isq/si/prefixes.h>
 #include <units/quantity.h>

-namespace units::physical::si::fps {
+namespace units::isq::si::fps {

 struct poundal_per_foot_sq : unit<poundal_per_foot_sq> {};

-struct dim_pressure : physical::dim_pressure<dim_pressure, poundal_per_foot_sq, dim_force, dim_area> {};
+struct dim_pressure : isq::dim_pressure<dim_pressure, poundal_per_foot_sq, dim_force, dim_area> {};

 template<UnitOf<dim_pressure> U, QuantityValue Rep = double>
 using pressure = quantity<dim_pressure, U, Rep>;
@@ -66,4 +66,4 @@ inline constexpr auto kpsi = pressure<kilopound_force_per_inch_sq, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::fps
+}  // namespace units::isq::si::fps
@@ -22,15 +22,15 @@

 #pragma once

-#include <units/physical/dimensions/speed.h>
-#include <units/physical/si/fps/length.h>
-#include <units/physical/si/fps/time.h>
+#include <units/isq/dimensions/speed.h>
+#include <units/isq/si/fps/length.h>
+#include <units/isq/si/fps/time.h>
 #include <units/quantity.h>

-namespace units::physical::si::fps {
+namespace units::isq::si::fps {

 struct foot_per_second : unit<foot_per_second> {};
-struct dim_speed : physical::dim_speed<dim_speed, foot_per_second, dim_length, dim_time> {};
+struct dim_speed : isq::dim_speed<dim_speed, foot_per_second, dim_length, dim_time> {};

 template<UnitOf<dim_speed> U, QuantityValue Rep = double>
 using speed = quantity<dim_speed, U, Rep>;
@@ -65,4 +65,4 @@ inline constexpr auto knot = speed<fps::knot, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::fps
+}  // namespace units::isq::si::fps
@@ -22,10 +22,10 @@

 #pragma once

-#include <units/physical/si/time.h>
+#include <units/isq/si/time.h>
 #include <units/quantity.h>

-namespace units::physical::si::fps {
+namespace units::isq::si::fps {

 using si::second;
 using si::minute;
@@ -46,4 +46,4 @@ using si::unit_constants::s;

 }  // namespace unit_constants

-}  // namespace units::physical::si::fps
+}  // namespace units::isq::si::fps
@@ -22,14 +22,14 @@

 #pragma once

-#include <units/physical/dimensions/volume.h>
-#include <units/physical/si/fps/length.h>
+#include <units/isq/dimensions/volume.h>
+#include <units/isq/si/fps/length.h>
 #include <units/quantity.h>

-namespace units::physical::si::fps {
+namespace units::isq::si::fps {

 struct cubic_foot : unit<cubic_foot> {};
-struct dim_volume : physical::dim_volume<dim_volume, cubic_foot, dim_length> {};
+struct dim_volume : isq::dim_volume<dim_volume, cubic_foot, dim_length> {};

 struct cubic_yard : deduced_unit<cubic_yard, dim_volume, yard> {};

@@ -55,4 +55,4 @@ inline constexpr auto yd3 = volume<cubic_yard, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::fps
+}  // namespace units::isq::si::fps
@@ -22,11 +22,11 @@

 #pragma once

-#include <units/physical/dimensions/frequency.h>
-#include <units/physical/si/time.h>
+#include <units/isq/dimensions/frequency.h>
+#include <units/isq/si/time.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct hertz : named_unit<hertz, "Hz", prefix> {};
 struct yoctohertz : prefixed_unit<yoctohertz, yocto, hertz> {};
@@ -46,7 +46,7 @@ struct exahertz : prefixed_unit<exahertz, exa, hertz> {};
 struct zettahertz : prefixed_unit<zettahertz, zetta, hertz> {};
 struct yottahertz : prefixed_unit<yottahertz, yotta, hertz> {};

-struct dim_frequency : physical::dim_frequency<dim_frequency, hertz, dim_time> {};
+struct dim_frequency : isq::dim_frequency<dim_frequency, hertz, dim_time> {};

 template<UnitOf<dim_frequency> U, QuantityValue Rep = double>
 using frequency = quantity<dim_frequency, U, Rep>;
@@ -145,4 +145,4 @@ inline constexpr auto YHz = frequency<yottahertz, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si
+}  // namespace units::isq::si
@@ -22,22 +22,22 @@

 #pragma once

-#include <units/physical/dimensions/heat_capacity.h>
-#include <units/physical/si/thermodynamic_temperature.h>
-#include <units/physical/si/energy.h>
-#include <units/physical/si/mass.h>
-#include <units/physical/si/amount_of_substance.h>
+#include <units/isq/dimensions/heat_capacity.h>
+#include <units/isq/si/thermodynamic_temperature.h>
+#include <units/isq/si/energy.h>
+#include <units/isq/si/mass.h>
+#include <units/isq/si/amount_of_substance.h>
 #include <units/quantity.h>

-namespace units::physical::si {
+namespace units::isq::si {

 struct joule_per_kelvin : unit<joule_per_kelvin> {};
 struct joule_per_kilogram_kelvin : unit<joule_per_kilogram_kelvin> {};
 struct joule_per_mole_kelvin : unit<joule_per_mole_kelvin> {};

-struct dim_heat_capacity : physical::dim_heat_capacity<dim_heat_capacity, joule_per_kelvin, dim_energy, dim_thermodynamic_temperature> {};
-struct dim_specific_heat_capacity : physical::dim_specific_heat_capacity<dim_specific_heat_capacity, joule_per_kilogram_kelvin, dim_heat_capacity, dim_mass> {};
-struct dim_molar_heat_capacity : physical::dim_molar_heat_capacity<dim_molar_heat_capacity, joule_per_mole_kelvin, dim_heat_capacity, dim_amount_of_substance> {};
+struct dim_heat_capacity : isq::dim_heat_capacity<dim_heat_capacity, joule_per_kelvin, dim_energy, dim_thermodynamic_temperature> {};
+struct dim_specific_heat_capacity : isq::dim_specific_heat_capacity<dim_specific_heat_capacity, joule_per_kilogram_kelvin, dim_heat_capacity, dim_mass> {};
+struct dim_molar_heat_capacity : isq::dim_molar_heat_capacity<dim_molar_heat_capacity, joule_per_mole_kelvin, dim_heat_capacity, dim_amount_of_substance> {};

 template<UnitOf<dim_heat_capacity> U, QuantityValue Rep = double>
 using heat_capacity = quantity<dim_heat_capacity, U, Rep>;
@@ -64,5 +64,5 @@ constexpr auto operator"" _q_J_per_mol_K(long double l) { return molar_heat_capa

 }  // namespace literals

-}  // namespace units::physical::si
+}  // namespace units::isq::si

@@ -22,4 +22,4 @@

 #pragma once

-#include <units/physical/si/iau/length.h>
+#include <units/isq/si/iau/length.h>
@@ -23,9 +23,9 @@

 #pragma once

-#include <units/physical/si/length.h>
+#include <units/isq/si/length.h>

-namespace units::physical::si::iau {
+namespace units::isq::si::iau {

 // https://en.wikipedia.org/wiki/Light-year
 struct light_year : named_scaled_unit<light_year, "ly", no_prefix, ratio(9460730472580800), si::metre> {};
@@ -60,4 +60,4 @@ inline constexpr auto angstrom = si::length<iau::angstrom, one_rep>{};

 }  // namespace unit_constants

-}  // namespace units::physical::si::iau
+}  // namespace units::isq::si::iau
--- a/Show More
+++ b/Show More