refactor: Refactored the library file tree

Resolves #249
2025-07-31 19:04:27 +02:00 · 2021-03-16 09:32:28 +01:00
parent d8367d31b8
commit 23720d055e
209 changed files with 452 additions and 451 deletions
--- a/README.md
+++ b/README.md
@@ -28,9 +28,9 @@ analysis and unit/quantity manipulation. The basic idea and design heavily bases
 Here is a small example of possible operations:
 ```cpp
-#include <units/physical/si/derived/area.h>
+#include <units/physical/si/area.h>
-#include <units/physical/si/derived/frequency.h>
+#include <units/physical/si/frequency.h>
-#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/speed.h>
 using namespace units::physical::si;
@@ -62,8 +62,8 @@ the below example for a quick preview of basic library features:
 ```cpp
 #include <units/format.h>
-#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/speed.h>
-#include <units/physical/si/international/derived/speed.h>
+#include <units/physical/si/international/speed.h>
 #include <units/quantity_io.h>
 #include <iostream>
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -3,6 +3,7 @@
 - **0.7.0 WIP**
  - (!) refactor: `ScalableNumber` renamed to `QuantityValue`
  - (!) refactor: output stream operators moved to the `units/quantity_io.h` header file
  - (!) refactor: Refactored the library file tree
  - refactor: quantity (kind) point updated to reflect latest changes to `quantity`
  - refactor: basic concepts, `quantity` and `quantity_cast` refactored
  - refactor: `abs()` definition refactored to be more explicit about the return type
--- a/docs/quick_start.rst
+++ b/docs/quick_start.rst
@@ -3,9 +3,9 @@ Quick Start
 Here is a small example of possible operations::
-    #include <units/physical/si/derived/area.h>
+    #include <units/physical/si/area.h>
-    #include <units/physical/si/derived/frequency.h>
+    #include <units/physical/si/frequency.h>
-    #include <units/physical/si/derived/speed.h>
+    #include <units/physical/si/speed.h>
    using namespace units::physical::si;
@@ -38,8 +38,8 @@ performed without sacrificing on accuracy. Please see the below example for a qu
 of basic library features::
    #include <units/format.h>
-    #include <units/physical/si/derived/speed.h>
+    #include <units/physical/si/speed.h>
-    #include <units/physical/si/international/derived/speed.h>
+    #include <units/physical/si/international/speed.h>
    #include <units/quantity_io.h>
    #include <iostream>
--- a/docs/reference/systems/data/bitrate.rst
+++ b/docs/reference/systems/data/bitrate.rst
@@ -1,4 +1,4 @@
 Bitrate
 =======
-.. doxygenfile:: data/derived/bitrate.h
+.. doxygenfile:: data/bitrate.h
--- a/docs/reference/systems/data/information.rst
+++ b/docs/reference/systems/data/information.rst
@@ -1,4 +1,4 @@
 Information
 ===========
-.. doxygenfile:: data/base/information.h
+.. doxygenfile:: data/information.h
--- a/docs/reference/systems/physical/si/absorbed_dose.rst
+++ b/docs/reference/systems/physical/si/absorbed_dose.rst
@@ -1,4 +1,4 @@
 Absorbed Dose
 =============
-.. doxygenfile:: si/derived/absorbed_dose.h
+.. doxygenfile:: si/absorbed_dose.h
--- a/docs/reference/systems/physical/si/acceleration.rst
+++ b/docs/reference/systems/physical/si/acceleration.rst
@@ -1,4 +1,4 @@
 Acceleration
 ============
-.. doxygenfile:: si/derived/acceleration.h
+.. doxygenfile:: si/acceleration.h
--- a/docs/reference/systems/physical/si/amount_of_substance.rst
+++ b/docs/reference/systems/physical/si/amount_of_substance.rst
@@ -1,4 +1,4 @@
 Amount of Substance
 ===================
-.. doxygenfile:: si/base/amount_of_substance.h
+.. doxygenfile:: si/amount_of_substance.h
--- a/docs/reference/systems/physical/si/area.rst
+++ b/docs/reference/systems/physical/si/area.rst
@@ -1,4 +1,4 @@
 Area
 ====
-.. doxygenfile:: si/derived/area.h
+.. doxygenfile:: si/area.h
--- a/docs/reference/systems/physical/si/capacitance.rst
+++ b/docs/reference/systems/physical/si/capacitance.rst
@@ -1,4 +1,4 @@
 Capacitance
 ===========
-.. doxygenfile:: si/derived/capacitance.h
+.. doxygenfile:: si/capacitance.h
--- a/docs/reference/systems/physical/si/catalytic_activity.rst
+++ b/docs/reference/systems/physical/si/catalytic_activity.rst
@@ -1,4 +1,4 @@
 Catalytic Activity
 ==================
-.. doxygenfile:: si/derived/catalytic_activity.h
+.. doxygenfile:: si/catalytic_activity.h
--- a/docs/reference/systems/physical/si/cgs/acceleration.rst
+++ b/docs/reference/systems/physical/si/cgs/acceleration.rst
@@ -1,4 +1,4 @@
 Acceleration
 ============
-.. doxygenfile:: si/cgs/derived/acceleration.h
+.. doxygenfile:: si/cgs/acceleration.h
--- a/docs/reference/systems/physical/si/cgs/area.rst
+++ b/docs/reference/systems/physical/si/cgs/area.rst
@@ -1,4 +1,4 @@
 Area
 ====
-.. doxygenfile:: si/cgs/derived/area.h
+.. doxygenfile:: si/cgs/area.h
--- a/docs/reference/systems/physical/si/cgs/energy.rst
+++ b/docs/reference/systems/physical/si/cgs/energy.rst
@@ -1,4 +1,4 @@
 Energy
 ======
-.. doxygenfile:: si/cgs/derived/energy.h
+.. doxygenfile:: si/cgs/energy.h
--- a/docs/reference/systems/physical/si/cgs/force.rst
+++ b/docs/reference/systems/physical/si/cgs/force.rst
@@ -1,4 +1,4 @@
 Force
 =====
-.. doxygenfile:: si/cgs/derived/force.h
+.. doxygenfile:: si/cgs/force.h
--- a/docs/reference/systems/physical/si/cgs/length.rst
+++ b/docs/reference/systems/physical/si/cgs/length.rst
@@ -1,4 +1,4 @@
 Length
 ======
-.. doxygenfile:: si/cgs/base/length.h
+.. doxygenfile:: si/cgs/length.h
--- a/docs/reference/systems/physical/si/cgs/mass.rst
+++ b/docs/reference/systems/physical/si/cgs/mass.rst
@@ -1,4 +1,4 @@
 Mass
 ====
-.. doxygenfile:: si/cgs/base/mass.h
+.. doxygenfile:: si/cgs/mass.h
--- a/docs/reference/systems/physical/si/cgs/power.rst
+++ b/docs/reference/systems/physical/si/cgs/power.rst
@@ -1,4 +1,4 @@
 Power
 =====
-.. doxygenfile:: si/cgs/derived/power.h
+.. doxygenfile:: si/cgs/power.h
--- a/docs/reference/systems/physical/si/cgs/pressure.rst
+++ b/docs/reference/systems/physical/si/cgs/pressure.rst
@@ -1,4 +1,4 @@
 Pressure
 ========
-.. doxygenfile:: si/cgs/derived/pressure.h
+.. doxygenfile:: si/cgs/pressure.h
--- a/docs/reference/systems/physical/si/cgs/speed.rst
+++ b/docs/reference/systems/physical/si/cgs/speed.rst
@@ -1,4 +1,4 @@
 Speed
 =====
-.. doxygenfile:: si/cgs/derived/speed.h
+.. doxygenfile:: si/cgs/speed.h
--- a/docs/reference/systems/physical/si/cgs/time.rst
+++ b/docs/reference/systems/physical/si/cgs/time.rst
@@ -1,4 +1,4 @@
 Time
 ====
-.. doxygenfile:: si/cgs/base/time.h
+.. doxygenfile:: si/cgs/time.h
--- a/docs/reference/systems/physical/si/charge_density.rst
+++ b/docs/reference/systems/physical/si/charge_density.rst
@@ -1,4 +1,4 @@
 Charge Density
 ==============
-.. doxygenfile:: si/derived/charge_density.h
+.. doxygenfile:: si/charge_density.h
--- a/docs/reference/systems/physical/si/concentration.rst
+++ b/docs/reference/systems/physical/si/concentration.rst
@@ -1,4 +1,4 @@
 Concentration
 =============
-.. doxygenfile:: si/derived/concentration.h
+.. doxygenfile:: si/concentration.h
--- a/docs/reference/systems/physical/si/conductance.rst
+++ b/docs/reference/systems/physical/si/conductance.rst
@@ -1,4 +1,4 @@
 Conductance
 ===========
-.. doxygenfile:: si/derived/conductance.h
+.. doxygenfile:: si/conductance.h
--- a/docs/reference/systems/physical/si/current_density.rst
+++ b/docs/reference/systems/physical/si/current_density.rst
@@ -1,4 +1,4 @@
 Current density
 ===============
-.. doxygenfile:: si/derived/current_density.h
+.. doxygenfile:: si/current_density.h
--- a/docs/reference/systems/physical/si/density.rst
+++ b/docs/reference/systems/physical/si/density.rst
@@ -1,4 +1,4 @@
 Density
 =======
-.. doxygenfile:: si/derived/density.h
+.. doxygenfile:: si/density.h
--- a/docs/reference/systems/physical/si/dynamic_viscosity.rst
+++ b/docs/reference/systems/physical/si/dynamic_viscosity.rst
@@ -1,4 +1,4 @@
 Dynamic Viscosity
 =================
-.. doxygenfile:: si/derived/dynamic_viscosity.h
+.. doxygenfile:: si/dynamic_viscosity.h
--- a/docs/reference/systems/physical/si/electric_charge.rst
+++ b/docs/reference/systems/physical/si/electric_charge.rst
@@ -1,4 +1,4 @@
 Electric Charge
 ===============
-.. doxygenfile:: si/derived/electric_charge.h
+.. doxygenfile:: si/electric_charge.h
--- a/docs/reference/systems/physical/si/electric_current.rst
+++ b/docs/reference/systems/physical/si/electric_current.rst
@@ -1,4 +1,4 @@
 Electric Current
 ================
-.. doxygenfile:: si/base/electric_current.h
+.. doxygenfile:: si/electric_current.h
--- a/docs/reference/systems/physical/si/electric_field_strength.rst
+++ b/docs/reference/systems/physical/si/electric_field_strength.rst
@@ -1,4 +1,4 @@
 Electric Field Strength
 =======================
-.. doxygenfile:: si/derived/electric_field_strength.h
+.. doxygenfile:: si/electric_field_strength.h
--- a/docs/reference/systems/physical/si/energy.rst
+++ b/docs/reference/systems/physical/si/energy.rst
@@ -1,4 +1,4 @@
 Energy
 ======
-.. doxygenfile:: si/derived/energy.h
+.. doxygenfile:: si/energy.h
--- a/docs/reference/systems/physical/si/force.rst
+++ b/docs/reference/systems/physical/si/force.rst
@@ -1,4 +1,4 @@
 Force
 =====
-.. doxygenfile:: si/derived/force.h
+.. doxygenfile:: si/force.h
--- a/docs/reference/systems/physical/si/fps/acceleration.rst
+++ b/docs/reference/systems/physical/si/fps/acceleration.rst
@@ -1,4 +1,4 @@
 Acceleration
 ============
-.. doxygenfile:: si/fps/derived/acceleration.h
+.. doxygenfile:: si/fps/acceleration.h
--- a/docs/reference/systems/physical/si/fps/area.rst
+++ b/docs/reference/systems/physical/si/fps/area.rst
@@ -1,4 +1,4 @@
 Area
 ====
-.. doxygenfile:: si/fps/derived/area.h
+.. doxygenfile:: si/fps/area.h
--- a/docs/reference/systems/physical/si/fps/density.rst
+++ b/docs/reference/systems/physical/si/fps/density.rst
@@ -1,4 +1,4 @@
 Density
 =======
-.. doxygenfile:: si/fps/derived/density.h
+.. doxygenfile:: si/fps/density.h
--- a/docs/reference/systems/physical/si/fps/energy.rst
+++ b/docs/reference/systems/physical/si/fps/energy.rst
@@ -1,4 +1,4 @@
 Energy
 ======
-.. doxygenfile:: si/fps/derived/energy.h
+.. doxygenfile:: si/fps/energy.h
--- a/docs/reference/systems/physical/si/fps/force.rst
+++ b/docs/reference/systems/physical/si/fps/force.rst
@@ -1,4 +1,4 @@
 Force
 =====
-.. doxygenfile:: si/fps/derived/force.h
+.. doxygenfile:: si/fps/force.h
--- a/docs/reference/systems/physical/si/fps/length.rst
+++ b/docs/reference/systems/physical/si/fps/length.rst
@@ -1,4 +1,4 @@
 Length
 ======
-.. doxygenfile:: si/fps/base/length.h
+.. doxygenfile:: si/fps/length.h
--- a/docs/reference/systems/physical/si/fps/mass.rst
+++ b/docs/reference/systems/physical/si/fps/mass.rst
@@ -1,4 +1,4 @@
 Mass
 ====
-.. doxygenfile:: si/fps/base/mass.h
+.. doxygenfile:: si/fps/mass.h
--- a/docs/reference/systems/physical/si/fps/power.rst
+++ b/docs/reference/systems/physical/si/fps/power.rst
@@ -1,4 +1,4 @@
 Power
 =====
-.. doxygenfile:: si/fps/derived/power.h
+.. doxygenfile:: si/fps/power.h
--- a/docs/reference/systems/physical/si/fps/pressure.rst
+++ b/docs/reference/systems/physical/si/fps/pressure.rst
@@ -1,4 +1,4 @@
 Pressure
 ========
-.. doxygenfile:: si/fps/derived/pressure.h
+.. doxygenfile:: si/fps/pressure.h
--- a/docs/reference/systems/physical/si/fps/speed.rst
+++ b/docs/reference/systems/physical/si/fps/speed.rst
@@ -1,4 +1,4 @@
 Speed
 =====
-.. doxygenfile:: si/fps/derived/speed.h
+.. doxygenfile:: si/fps/speed.h
--- a/docs/reference/systems/physical/si/fps/time.rst
+++ b/docs/reference/systems/physical/si/fps/time.rst
@@ -1,4 +1,4 @@
 Time
 ====
-.. doxygenfile:: si/fps/base/time.h
+.. doxygenfile:: si/fps/time.h
--- a/docs/reference/systems/physical/si/fps/volume.rst
+++ b/docs/reference/systems/physical/si/fps/volume.rst
@@ -1,4 +1,4 @@
 Volume
 ======
-.. doxygenfile:: si/fps/derived/volume.h
+.. doxygenfile:: si/fps/volume.h
--- a/docs/reference/systems/physical/si/frequency.rst
+++ b/docs/reference/systems/physical/si/frequency.rst
@@ -1,4 +1,4 @@
 Frequency
 =========
-.. doxygenfile:: si/derived/frequency.h
+.. doxygenfile:: si/frequency.h
--- a/docs/reference/systems/physical/si/heat_capacity.rst
+++ b/docs/reference/systems/physical/si/heat_capacity.rst
@@ -1,4 +1,4 @@
 Heat Capacity
 =============
-.. doxygenfile:: si/derived/heat_capacity.h
+.. doxygenfile:: si/heat_capacity.h
--- a/docs/reference/systems/physical/si/iau/length.rst
+++ b/docs/reference/systems/physical/si/iau/length.rst
@@ -1,4 +1,4 @@
 Length
 ======
-.. doxygenfile:: si/iau/base/length.h
+.. doxygenfile:: si/iau/length.h
--- a/docs/reference/systems/physical/si/imperial/length.rst
+++ b/docs/reference/systems/physical/si/imperial/length.rst
@@ -1,4 +1,4 @@
 Length
 ======
-.. doxygenfile:: si/imperial/base/length.h
+.. doxygenfile:: si/imperial/length.h
--- a/docs/reference/systems/physical/si/inductance.rst
+++ b/docs/reference/systems/physical/si/inductance.rst
@@ -1,4 +1,4 @@
 Inductance
 ==========
-.. doxygenfile:: si/derived/inductance.h
+.. doxygenfile:: si/inductance.h
--- a/docs/reference/systems/physical/si/international/area.rst
+++ b/docs/reference/systems/physical/si/international/area.rst
@@ -1,4 +1,4 @@
 Area
 ====
-.. doxygenfile:: si/international/derived/area.h
+.. doxygenfile:: si/international/area.h
--- a/docs/reference/systems/physical/si/international/length.rst
+++ b/docs/reference/systems/physical/si/international/length.rst
@@ -1,4 +1,4 @@
 Length
 ======
-.. doxygenfile:: si/international/base/length.h
+.. doxygenfile:: si/international/length.h
--- a/docs/reference/systems/physical/si/international/speed.rst
+++ b/docs/reference/systems/physical/si/international/speed.rst
@@ -1,4 +1,4 @@
 Speed
 =====
-.. doxygenfile:: speed/derived/speed.h
+.. doxygenfile:: speed/speed.h
--- a/docs/reference/systems/physical/si/international/volume.rst
+++ b/docs/reference/systems/physical/si/international/volume.rst
@@ -1,4 +1,4 @@
 Volume
 ======
-.. doxygenfile:: si/international/derived/volume.h
+.. doxygenfile:: si/international/volume.h
--- a/docs/reference/systems/physical/si/length.rst
+++ b/docs/reference/systems/physical/si/length.rst
@@ -1,4 +1,4 @@
 Length
 ======
-.. doxygenfile:: si/base/length.h
+.. doxygenfile:: si/length.h
--- a/docs/reference/systems/physical/si/luminance.rst
+++ b/docs/reference/systems/physical/si/luminance.rst
@@ -1,4 +1,4 @@
 Luminance
 =========
-.. doxygenfile:: si/derived/luminance.h
+.. doxygenfile:: si/luminance.h
--- a/docs/reference/systems/physical/si/luminous_intensity.rst
+++ b/docs/reference/systems/physical/si/luminous_intensity.rst
@@ -1,4 +1,4 @@
 Luminous Intensity
 ==================
-.. doxygenfile:: si/base/luminous_intensity.h
+.. doxygenfile:: si/luminous_intensity.h
--- a/docs/reference/systems/physical/si/magnetic_flux.rst
+++ b/docs/reference/systems/physical/si/magnetic_flux.rst
@@ -1,4 +1,4 @@
 Magnetic Flux
 =============
-.. doxygenfile:: si/derived/magnetic_flux.h
+.. doxygenfile:: si/magnetic_flux.h
--- a/docs/reference/systems/physical/si/magnetic_induction.rst
+++ b/docs/reference/systems/physical/si/magnetic_induction.rst
@@ -1,4 +1,4 @@
 Magnetic Induction
 ==================
-.. doxygenfile:: si/derived/magnetic_induction.h
+.. doxygenfile:: si/magnetic_induction.h
--- a/docs/reference/systems/physical/si/mass.rst
+++ b/docs/reference/systems/physical/si/mass.rst
@@ -1,4 +1,4 @@
 Mass
 ====
-.. doxygenfile:: si/base/mass.h
+.. doxygenfile:: si/mass.h
--- a/docs/reference/systems/physical/si/molar_energy.rst
+++ b/docs/reference/systems/physical/si/molar_energy.rst
@@ -1,4 +1,4 @@
 Molar Energy
 ============
-.. doxygenfile:: si/derived/molar_energy.h
+.. doxygenfile:: si/molar_energy.h
--- a/docs/reference/systems/physical/si/momentum.rst
+++ b/docs/reference/systems/physical/si/momentum.rst
@@ -1,4 +1,4 @@
 Momentum
 ========
-.. doxygenfile:: si/derived/momentum.h
+.. doxygenfile:: si/momentum.h
--- a/docs/reference/systems/physical/si/permeability.rst
+++ b/docs/reference/systems/physical/si/permeability.rst
@@ -1,4 +1,4 @@
 Permeability
 ============
-.. doxygenfile:: si/derived/permeability.h
+.. doxygenfile:: si/permeability.h
--- a/docs/reference/systems/physical/si/permittivity.rst
+++ b/docs/reference/systems/physical/si/permittivity.rst
@@ -1,4 +1,4 @@
 Permittivity
 ============
-.. doxygenfile:: si/derived/permittivity.h
+.. doxygenfile:: si/permittivity.h
--- a/docs/reference/systems/physical/si/power.rst
+++ b/docs/reference/systems/physical/si/power.rst
@@ -1,4 +1,4 @@
 Power
 =====
-.. doxygenfile:: si/derived/power.h
+.. doxygenfile:: si/power.h
--- a/docs/reference/systems/physical/si/pressure.rst
+++ b/docs/reference/systems/physical/si/pressure.rst
@@ -1,4 +1,4 @@
 Pressure
 ========
-.. doxygenfile:: si/derived/pressure.h
+.. doxygenfile:: si/pressure.h
--- a/docs/reference/systems/physical/si/resistance.rst
+++ b/docs/reference/systems/physical/si/resistance.rst
@@ -1,4 +1,4 @@
 Resistance
 ==========
-.. doxygenfile:: si/derived/resistance.h
+.. doxygenfile:: si/resistance.h
--- a/docs/reference/systems/physical/si/speed.rst
+++ b/docs/reference/systems/physical/si/speed.rst
@@ -1,4 +1,4 @@
 Speed
 =====
-.. doxygenfile:: si/derived/speed.h
+.. doxygenfile:: si/speed.h
--- a/docs/reference/systems/physical/si/surface_tension.rst
+++ b/docs/reference/systems/physical/si/surface_tension.rst
@@ -1,4 +1,4 @@
 Surface Tension
 ===============
-.. doxygenfile:: si/derived/surface_tension.h
+.. doxygenfile:: si/surface_tension.h
--- a/docs/reference/systems/physical/si/thermal_conductivity.rst
+++ b/docs/reference/systems/physical/si/thermal_conductivity.rst
@@ -1,4 +1,4 @@
 Thermal Conductivity
 ====================
-.. doxygenfile:: si/derived/thermal_conductivity.h
+.. doxygenfile:: si/thermal_conductivity.h
--- a/docs/reference/systems/physical/si/thermodynamic_temperature.rst
+++ b/docs/reference/systems/physical/si/thermodynamic_temperature.rst
@@ -1,4 +1,4 @@
 Temperature
 ===========
-.. doxygenfile:: si/base/thermodynamic_temperature.h
+.. doxygenfile:: si/thermodynamic_temperature.h
--- a/docs/reference/systems/physical/si/time.rst
+++ b/docs/reference/systems/physical/si/time.rst
@@ -1,4 +1,4 @@
 Time
 ====
-.. doxygenfile:: si/base/time.h
+.. doxygenfile:: si/time.h
--- a/docs/reference/systems/physical/si/typographic/length.rst
+++ b/docs/reference/systems/physical/si/typographic/length.rst
@@ -1,4 +1,4 @@
 Length
 ======
-.. doxygenfile:: si/typographic/base/length.h
+.. doxygenfile:: si/typographic/length.h
--- a/docs/reference/systems/physical/si/us/length.rst
+++ b/docs/reference/systems/physical/si/us/length.rst
@@ -1,4 +1,4 @@
 Length
 ======
-.. doxygenfile:: si/us/base/length.h
+.. doxygenfile:: si/us/length.h
--- a/docs/reference/systems/physical/si/voltage.rst
+++ b/docs/reference/systems/physical/si/voltage.rst
@@ -1,4 +1,4 @@
 Voltage
 =======
-.. doxygenfile:: si/derived/voltage.h
+.. doxygenfile:: si/voltage.h
--- a/docs/reference/systems/physical/si/volume.rst
+++ b/docs/reference/systems/physical/si/volume.rst
@@ -1,4 +1,4 @@
 Volume
 ======
-.. doxygenfile:: si/derived/volume.h
+.. doxygenfile:: si/volume.h
--- a/docs/use_cases/interoperability.rst
+++ b/docs/use_cases/interoperability.rst
@@ -16,7 +16,7 @@ provide the following:
 For example, to provide support for the ``std::chrono::duration`` it is enough to define::
    #include <units/customization_points.h>
-    #include <units/physical/si/base/time.h>
+    #include <units/physical/si/time.h>
    #include <chrono>
    namespace units {
--- a/docs/use_cases/unknown_dimensions.rst
+++ b/docs/use_cases/unknown_dimensions.rst
@@ -41,8 +41,8 @@ dimensions used in the division operation:
 .. code-block::
    :emphasize-lines: 1-2,8,10
-    #include <units/physical/si/base/length.h>
+    #include <units/physical/si/length.h>
-    #include <units/physical/si/base/time.h>
+    #include <units/physical/si/time.h>
    using namespace units::physical::si;
--- a/example/alternative_namespaces/acceleration.h
+++ b/example/alternative_namespaces/acceleration.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <units/physical/si/derived/acceleration.h>
+#include <units/physical/si/acceleration.h>
 namespace units{
 namespace experimental{
--- a/example/alternative_namespaces/area.h
+++ b/example/alternative_namespaces/area.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <units/physical/si/derived/area.h>
+#include <units/physical/si/area.h>
 namespace area {
--- a/example/alternative_namespaces/capacitor_time_curve.cpp
+++ b/example/alternative_namespaces/capacitor_time_curve.cpp
@@ -20,9 +20,9 @@
    physical_quantities
 */
-#include <units/physical/si/derived/capacitance.h>
+#include <units/physical/si/capacitance.h>
-#include <units/physical/si/derived/resistance.h>
+#include <units/physical/si/resistance.h>
-#include <units/physical/si/base/time.h>
+#include <units/physical/si/time.h>
 #include <units/math.h>
 #include <units/quantity_io.h>
 #include "./voltage.h"
--- a/example/alternative_namespaces/density.h
+++ b/example/alternative_namespaces/density.h
@@ -2,7 +2,7 @@
 #pragma once
-#include <units/physical/si/derived/density.h>
+#include <units/physical/si/density.h>
 namespace units{
 namespace experimental{
--- a/example/alternative_namespaces/force.h
+++ b/example/alternative_namespaces/force.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <units/physical/si/derived/force.h>
+#include <units/physical/si/force.h>
 namespace units{
 namespace experimental{
--- a/example/alternative_namespaces/length.h
+++ b/example/alternative_namespaces/length.h
@@ -2,12 +2,12 @@
 #pragma once
-#include <units/physical/si/base/length.h>
+#include <units/physical/si/length.h>
-#include <units/physical/si/imperial/base/length.h>
+#include <units/physical/si/imperial/length.h>
-#include <units/physical/si/international/base/length.h>
+#include <units/physical/si/international/length.h>
-#include <units/physical/si/typographic/base/length.h>
+#include <units/physical/si/typographic/length.h>
-#include <units/physical/si/us/base/length.h>
+#include <units/physical/si/us/length.h>
-#include <units/physical/si/iau/base/length.h>
+#include <units/physical/si/iau/length.h>
 namespace units{
 namespace experimental{
--- a/example/alternative_namespaces/mass.h
+++ b/example/alternative_namespaces/mass.h
@@ -2,7 +2,7 @@
 #pragma once
-#include <units/physical/si/base/mass.h>
+#include <units/physical/si/mass.h>
 namespace units{
 namespace experimental{
--- a/example/alternative_namespaces/time.h
+++ b/example/alternative_namespaces/time.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <units/physical/si/base/time.h>
+#include <units/physical/si/time.h>
 // named qtime due to conflict with time_t time(time_t*)
 namespace q_time {
--- a/example/alternative_namespaces/voltage.h
+++ b/example/alternative_namespaces/voltage.h
@@ -2,7 +2,7 @@
 #pragma once
-#include <units/physical/si/derived/voltage.h>
+#include <units/physical/si/voltage.h>
 namespace units{
 namespace experimental{
--- a/example/alternative_namespaces/volume.h
+++ b/example/alternative_namespaces/volume.h
@@ -2,7 +2,7 @@
 #pragma once
-#include <units/physical/si/derived/volume.h>
+#include <units/physical/si/volume.h>
 namespace units{
 namespace experimental{
--- a/example/avg_speed.cpp
+++ b/example/avg_speed.cpp
@@ -20,9 +20,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-#include <units/physical/si/cgs/derived/speed.h>
+#include <units/physical/si/cgs/speed.h>
-#include <units/physical/si/international/derived/speed.h>
+#include <units/physical/si/international/speed.h>
-#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/speed.h>
 #include <units/quantity_io.h>
 #include <iostream>
--- a/example/box_example.cpp
+++ b/example/box_example.cpp
@@ -1,11 +1,11 @@
 #include <units/physical/si/constants.h>
-#include <units/physical/si/derived/area.h>
+#include <units/physical/si/area.h>
-#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/speed.h>
-#include <units/physical/si/derived/density.h>
+#include <units/physical/si/density.h>
-#include <units/physical/si/derived/force.h>
+#include <units/physical/si/force.h>
-#include <units/physical/si/base/mass.h>
+#include <units/physical/si/mass.h>
-#include <units/physical/si/base/time.h>
+#include <units/physical/si/time.h>
-#include <units/physical/si/derived/volume.h>
+#include <units/physical/si/volume.h>
 #include <units/format.h>
 #include <cassert>
 #include <iostream>
--- a/example/capacitor_time_curve.cpp
+++ b/example/capacitor_time_curve.cpp
@@ -20,10 +20,10 @@
    physical_quantities
 */
-#include <units/physical/si/derived/capacitance.h>
+#include <units/physical/si/capacitance.h>
-#include <units/physical/si/derived/resistance.h>
+#include <units/physical/si/resistance.h>
-#include <units/physical/si/base/time.h>
+#include <units/physical/si/time.h>
-#include <units/physical/si/derived/voltage.h>
+#include <units/physical/si/voltage.h>
 #include <units/math.h>
 #include <units/quantity_io.h>
 #include <iostream>
--- a/example/clcpp_response.cpp
+++ b/example/clcpp_response.cpp
@@ -16,15 +16,15 @@
 */
 #include <units/format.h>
-#include <units/physical/si/derived/area.h>
+#include <units/physical/si/area.h>
-#include <units/physical/si/iau/base/length.h>
+#include <units/physical/si/iau/length.h>
-#include <units/physical/si/imperial/base/length.h>
+#include <units/physical/si/imperial/length.h>
-#include <units/physical/si/international/base/length.h>
+#include <units/physical/si/international/length.h>
-#include <units/physical/si/base/length.h>
+#include <units/physical/si/length.h>
-#include <units/physical/si/base/time.h>
+#include <units/physical/si/time.h>
-#include <units/physical/si/typographic/base/length.h>
+#include <units/physical/si/typographic/length.h>
-#include <units/physical/si/us/base/length.h>
+#include <units/physical/si/us/length.h>
-#include <units/physical/si/derived/volume.h>
+#include <units/physical/si/volume.h>
 #include <units/quantity_io.h>
 #include <iostream>
--- a/example/conversion_factor.cpp
+++ b/example/conversion_factor.cpp
@@ -15,7 +15,7 @@
 along with this program. If not, see http://www.gnu.org/licenses./
 */
-#include <units/physical/si/base/length.h>
+#include <units/physical/si/length.h>
 #include <units/format.h>
 #include <units/quantity_io.h>
 #include <iostream>
--- a/example/experimental_angle.cpp
+++ b/example/experimental_angle.cpp
@@ -22,9 +22,9 @@
 #include <units/format.h>
 #include <units/generic/angle.h>
-#include <units/physical/si/base/length.h>
+#include <units/physical/si/length.h>
-#include <units/physical/si/derived/energy.h>
+#include <units/physical/si/energy.h>
-#include <units/physical/si/derived/torque.h>
+#include <units/physical/si/torque.h>
 #include <units/quantity_io.h>
 #include <iostream>
--- a/example/foot_pound_second.cpp
+++ b/example/foot_pound_second.cpp
@@ -22,17 +22,17 @@
 #include <units/concepts.h>
 #include <units/format.h>
-#include <units/physical/si/fps/derived/density.h>
+#include <units/physical/si/fps/density.h>
-#include <units/physical/si/fps/base/length.h>
+#include <units/physical/si/fps/length.h>
-#include <units/physical/si/fps/base/mass.h>
+#include <units/physical/si/fps/mass.h>
-#include <units/physical/si/fps/derived/power.h>
+#include <units/physical/si/fps/power.h>
-#include <units/physical/si/fps/derived/speed.h>
+#include <units/physical/si/fps/speed.h>
-#include <units/physical/si/fps/derived/volume.h>
+#include <units/physical/si/fps/volume.h>
-#include <units/physical/si/base/length.h>
+#include <units/physical/si/length.h>
-#include <units/physical/si/base/mass.h>
+#include <units/physical/si/mass.h>
-#include <units/physical/si/derived/power.h>
+#include <units/physical/si/power.h>
-#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/speed.h>
-#include <units/physical/si/derived/volume.h>
+#include <units/physical/si/volume.h>
 #include <units/quantity.h>
 #include <iostream>
--- a/example/geographic.h
+++ b/example/geographic.h
@@ -23,7 +23,7 @@
 #pragma once
 #include <units/format.h>
-#include <units/physical/si/base/length.h>
+#include <units/physical/si/length.h>
 #include <units/quantity_kind.h>
 #include <compare>
--- a/example/glide_computer.h
+++ b/example/glide_computer.h
@@ -25,8 +25,8 @@
 #include "geographic.h"
 #include <units/format.h>
 #include <units/math.h>
-#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/speed.h>
-#include <units/physical/si/international/base/length.h>
+#include <units/physical/si/international/length.h>
 #include <units/quantity_point_kind.h>
 // An example of a really simplified tactical glide computer
--- a/example/hello_units.cpp
+++ b/example/hello_units.cpp
@@ -21,8 +21,8 @@
 // SOFTWARE.
 #include <units/format.h>
-#include <units/physical/si/international/derived/speed.h>
+#include <units/physical/si/international/speed.h>
-#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/speed.h>
 #include <units/quantity_io.h>
 #include <iostream>
--- a/example/kalman_filter-alpha_beta_filter_example2.cpp
+++ b/example/kalman_filter-alpha_beta_filter_example2.cpp
@@ -1,5 +1,5 @@
 #include <units/format.h>
-#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/speed.h>
 #include <iostream>
 #include <array>
--- a/example/linear_algebra.cpp
+++ b/example/linear_algebra.cpp
@@ -20,9 +20,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/speed.h>
-#include <units/physical/si/derived/force.h>
+#include <units/physical/si/force.h>
-#include <units/physical/si/derived/energy.h>
+#include <units/physical/si/energy.h>
 #include <units/format.h>
 #include <units/quantity_io.h>
 #include <linear_algebra.hpp>
--- a/example/measurement.cpp
+++ b/example/measurement.cpp
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-#include <units/physical/si/derived/acceleration.h>
+#include <units/physical/si/acceleration.h>
 #include <units/quantity_io.h>
 #include <cmath>
 #include <compare>
--- a/Show More
+++ b/Show More