refactor: modules-like behavior for systems removed to improve broken compile-time

Reffers to #32
2020-09-13 00:11:02 +02:00
parent accd113ad2
commit 6e510b3a2a
213 changed files with 479 additions and 839 deletions
--- a/README.md
+++ b/README.md
@ -26,7 +26,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/si.h>
+#include <units/physical/si/derived/area.h>
+#include <units/physical/si/derived/frequency.h>
+#include <units/physical/si/derived/speed.h>

 using namespace units::physical::si;

@ -57,8 +59,8 @@ and dimensional analysis can be performed without sacrificing on accuracy. Pleas
 the below example for a quick preview of basic library features:

 ```cpp
-#include <units/physical/si/si.h>
-#include <units/physical/si/international/international.h>
+#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/international/derived/speed.h>
 #include <units/format.h>
 #include <iostream>

--- a/docs/quick_start.rst
+++ b/docs/quick_start.rst
@ -3,7 +3,9 @@ Quick Start

 Here is a small example of possible operations::

-    #include <units/physical/si/si.h>
+    #include <units/physical/si/derived/area.h>
+    #include <units/physical/si/derived/frequency.h>
+    #include <units/physical/si/derived/speed.h>

    using namespace units::physical::si;

@ -27,7 +29,7 @@ Here is a small example of possible operations::

 .. admonition:: Try it on Compiler Explorer

-    `Example #1 <https://godbolt.org/z/oc7P9z>`_
+    `Example #1 <https://godbolt.org/z/jrKeqe>`_

 This library requires some C++20 features (concepts, classes as
 :abbr:`NTTP (Non-Type Template Parameter)`, ...). Thanks to them the user gets a powerful
@ -35,8 +37,8 @@ but still easy to use interface where all unit conversions and dimensional analy
 performed without sacrificing on accuracy. Please see the below example for a quick preview
 of basic library features::

-    #include <units/physical/si/si.h>
-    #include <units/physical/si/international/international.h>
+    #include <units/physical/si/derived/speed.h>
+    #include <units/physical/si/international/derived/speed.h>
    #include <units/format.h>
    #include <iostream>

--- a/docs_disabled/reference/systems/physical/si/absorbed_dose.rst
+++ b/docs_disabled/reference/systems/physical/si/absorbed_dose.rst
@ -1,4 +1,4 @@
 Absorbed Dose
 =============

-.. doxygenfile:: si/bits/derived/absorbed_dose.h
+.. doxygenfile:: si/derived/absorbed_dose.h
--- a/docs_disabled/reference/systems/physical/si/acceleration.rst
+++ b/docs_disabled/reference/systems/physical/si/acceleration.rst
@ -1,4 +1,4 @@
 Acceleration
 ============

-.. doxygenfile:: si/bits/derived/acceleration.h
+.. doxygenfile:: si/derived/acceleration.h
--- a/docs_disabled/reference/systems/physical/si/area.rst
+++ b/docs_disabled/reference/systems/physical/si/area.rst
@ -1,4 +1,4 @@
 Area
 ====

-.. doxygenfile:: si/bits/derived/area.h
+.. doxygenfile:: si/derived/area.h
--- a/docs_disabled/reference/systems/physical/si/capacitance.rst
+++ b/docs_disabled/reference/systems/physical/si/capacitance.rst
@ -1,4 +1,4 @@
 Capacitance
 ===========

-.. doxygenfile:: si/bits/derived/capacitance.h
+.. doxygenfile:: si/derived/capacitance.h
--- a/docs_disabled/reference/systems/physical/si/catalytic_activity.rst
+++ b/docs_disabled/reference/systems/physical/si/catalytic_activity.rst
@ -1,4 +1,4 @@
 Catalytic Activity
 ==================

-.. doxygenfile:: si/bits/derived/catalytic_activity.h
+.. doxygenfile:: si/derived/catalytic_activity.h
--- a/docs_disabled/reference/systems/physical/si/cgs/acceleration.rst
+++ b/docs_disabled/reference/systems/physical/si/cgs/acceleration.rst
@ -1,4 +1,4 @@
 Acceleration
 ============

-.. doxygenfile:: si/cgs/bits/derived/acceleration.h
+.. doxygenfile:: si/cgs/derived/acceleration.h
--- a/docs_disabled/reference/systems/physical/si/cgs/area.rst
+++ b/docs_disabled/reference/systems/physical/si/cgs/area.rst
@ -1,4 +1,4 @@
 Area
 ====

-.. doxygenfile:: si/cgs/bits/derived/area.h
+.. doxygenfile:: si/cgs/derived/area.h
--- a/docs_disabled/reference/systems/physical/si/cgs/energy.rst
+++ b/docs_disabled/reference/systems/physical/si/cgs/energy.rst
@ -1,4 +1,4 @@
 Energy
 ======

-.. doxygenfile:: si/cgs/bits/derived/energy.h
+.. doxygenfile:: si/cgs/derived/energy.h
--- a/docs_disabled/reference/systems/physical/si/cgs/force.rst
+++ b/docs_disabled/reference/systems/physical/si/cgs/force.rst
@ -1,4 +1,4 @@
 Force
 =====

-.. doxygenfile:: si/cgs/bits/derived/force.h
+.. doxygenfile:: si/cgs/derived/force.h
--- a/docs_disabled/reference/systems/physical/si/cgs/power.rst
+++ b/docs_disabled/reference/systems/physical/si/cgs/power.rst
@ -1,4 +1,4 @@
 Power
 =====

-.. doxygenfile:: si/cgs/bits/derived/power.h
+.. doxygenfile:: si/cgs/derived/power.h
--- a/docs_disabled/reference/systems/physical/si/cgs/pressure.rst
+++ b/docs_disabled/reference/systems/physical/si/cgs/pressure.rst
@ -1,4 +1,4 @@
 Pressure
 ========

-.. doxygenfile:: si/cgs/bits/derived/pressure.h
+.. doxygenfile:: si/cgs/derived/pressure.h
--- a/docs_disabled/reference/systems/physical/si/cgs/speed.rst
+++ b/docs_disabled/reference/systems/physical/si/cgs/speed.rst
@ -1,4 +1,4 @@
 Speed
 =====

-.. doxygenfile:: si/cgs/bits/derived/speed.h
+.. doxygenfile:: si/cgs/derived/speed.h
--- a/docs_disabled/reference/systems/physical/si/charge_density.rst
+++ b/docs_disabled/reference/systems/physical/si/charge_density.rst
@ -1,4 +1,4 @@
 Charge Density
 ==============

-.. doxygenfile:: si/bits/derived/charge_density.h
+.. doxygenfile:: si/derived/charge_density.h
--- a/docs_disabled/reference/systems/physical/si/concentration.rst
+++ b/docs_disabled/reference/systems/physical/si/concentration.rst
@ -1,4 +1,4 @@
 Concentration
 =============

-.. doxygenfile:: si/bits/derived/conductance.h
+.. doxygenfile:: si/derived/conductance.h
--- a/docs_disabled/reference/systems/physical/si/conductance.rst
+++ b/docs_disabled/reference/systems/physical/si/conductance.rst
@ -1,4 +1,4 @@
 Conductance
 ===========

-.. doxygenfile:: si/bits/derived/conductance.h
+.. doxygenfile:: si/derived/conductance.h
--- a/docs_disabled/reference/systems/physical/si/current_density.rst
+++ b/docs_disabled/reference/systems/physical/si/current_density.rst
@ -1,4 +1,4 @@
 Current density
 ===============

-.. doxygenfile:: si/bits/derived/current_density.h
+.. doxygenfile:: si/derived/current_density.h
--- a/docs_disabled/reference/systems/physical/si/density.rst
+++ b/docs_disabled/reference/systems/physical/si/density.rst
@ -1,4 +1,4 @@
 Density
 =======

-.. doxygenfile:: si/bits/derived/density.h
+.. doxygenfile:: si/derived/density.h
--- a/docs_disabled/reference/systems/physical/si/dynamic_viscosity.rst
+++ b/docs_disabled/reference/systems/physical/si/dynamic_viscosity.rst
@ -1,4 +1,4 @@
 Dynamic Viscosity
 =================

-.. doxygenfile:: si/bits/derived/dynamic_viscosity.h
+.. doxygenfile:: si/derived/dynamic_viscosity.h
--- a/docs_disabled/reference/systems/physical/si/electric_charge.rst
+++ b/docs_disabled/reference/systems/physical/si/electric_charge.rst
@ -1,4 +1,4 @@
 Electric Charge
 ===============

-.. doxygenfile:: si/bits/derived/electric_charge.h
+.. doxygenfile:: si/derived/electric_charge.h
--- a/docs_disabled/reference/systems/physical/si/electric_field_strength.rst
+++ b/docs_disabled/reference/systems/physical/si/electric_field_strength.rst
@ -1,4 +1,4 @@
 Electric Field Strength
 =======================

-.. doxygenfile:: si/bits/derived/electric_field_strength.h
+.. doxygenfile:: si/derived/electric_field_strength.h
--- a/docs_disabled/reference/systems/physical/si/energy.rst
+++ b/docs_disabled/reference/systems/physical/si/energy.rst
@ -1,4 +1,4 @@
 Energy
 ======

-.. doxygenfile:: si/bits/derived/energy.h
+.. doxygenfile:: si/derived/energy.h
--- a/docs_disabled/reference/systems/physical/si/force.rst
+++ b/docs_disabled/reference/systems/physical/si/force.rst
@ -1,4 +1,4 @@
 Force
 =====

-.. doxygenfile:: si/bits/derived/force.h
+.. doxygenfile:: si/derived/force.h
--- a/docs_disabled/reference/systems/physical/si/fps/acceleration.rst
+++ b/docs_disabled/reference/systems/physical/si/fps/acceleration.rst
@ -1,4 +1,4 @@
 Acceleration
 ============

-.. doxygenfile:: si/fps/bits/derived/acceleration.h
+.. doxygenfile:: si/fps/derived/acceleration.h
--- a/docs_disabled/reference/systems/physical/si/fps/area.rst
+++ b/docs_disabled/reference/systems/physical/si/fps/area.rst
@ -1,4 +1,4 @@
 Area
 ====

-.. doxygenfile:: si/fps/bits/derived/area.h
+.. doxygenfile:: si/fps/derived/area.h
--- a/docs_disabled/reference/systems/physical/si/fps/density.rst
+++ b/docs_disabled/reference/systems/physical/si/fps/density.rst
@ -1,4 +1,4 @@
 Density
 =======

-.. doxygenfile:: si/fps/bits/derived/density.h
+.. doxygenfile:: si/fps/derived/density.h
--- a/docs_disabled/reference/systems/physical/si/fps/energy.rst
+++ b/docs_disabled/reference/systems/physical/si/fps/energy.rst
@ -1,4 +1,4 @@
 Energy
 ======

-.. doxygenfile:: si/fps/bits/derived/energy.h
+.. doxygenfile:: si/fps/derived/energy.h
--- a/docs_disabled/reference/systems/physical/si/fps/force.rst
+++ b/docs_disabled/reference/systems/physical/si/fps/force.rst
@ -1,4 +1,4 @@
 Force
 =====

-.. doxygenfile:: si/fps/bits/derived/force.h
+.. doxygenfile:: si/fps/derived/force.h
--- a/docs_disabled/reference/systems/physical/si/fps/power.rst
+++ b/docs_disabled/reference/systems/physical/si/fps/power.rst
@ -1,4 +1,4 @@
 Power
 =====

-.. doxygenfile:: si/fps/bits/derived/power.h
+.. doxygenfile:: si/fps/derived/power.h
--- a/docs_disabled/reference/systems/physical/si/fps/pressure.rst
+++ b/docs_disabled/reference/systems/physical/si/fps/pressure.rst
@ -1,4 +1,4 @@
 Pressure
 ========

-.. doxygenfile:: si/fps/bits/derived/pressure.h
+.. doxygenfile:: si/fps/derived/pressure.h
--- a/docs_disabled/reference/systems/physical/si/fps/speed.rst
+++ b/docs_disabled/reference/systems/physical/si/fps/speed.rst
@ -1,4 +1,4 @@
 Speed
 =====

-.. doxygenfile:: si/fps/bits/derived/speed.h
+.. doxygenfile:: si/fps/derived/speed.h
--- a/docs_disabled/reference/systems/physical/si/fps/volume.rst
+++ b/docs_disabled/reference/systems/physical/si/fps/volume.rst
@ -1,4 +1,4 @@
 Volume
 ======

-.. doxygenfile:: si/fps/bits/derived/volume.h
+.. doxygenfile:: si/fps/derived/volume.h
--- a/docs_disabled/reference/systems/physical/si/frequency.rst
+++ b/docs_disabled/reference/systems/physical/si/frequency.rst
@ -1,4 +1,4 @@
 Frequency
 =========

-.. doxygenfile:: si/bits/derived/frequency.h
+.. doxygenfile:: si/derived/frequency.h
--- a/docs_disabled/reference/systems/physical/si/heat_capacity.rst
+++ b/docs_disabled/reference/systems/physical/si/heat_capacity.rst
@ -1,4 +1,4 @@
 Heat Capacity
 =============

-.. doxygenfile:: si/bits/derived/heat_capacity.h
+.. doxygenfile:: si/derived/heat_capacity.h
--- a/docs_disabled/reference/systems/physical/si/inductance.rst
+++ b/docs_disabled/reference/systems/physical/si/inductance.rst
@ -1,4 +1,4 @@
 Inductance
 ==========

-.. doxygenfile:: si/bits/derived/inductance.h
+.. doxygenfile:: si/derived/inductance.h
--- a/docs_disabled/reference/systems/physical/si/international/area.rst
+++ b/docs_disabled/reference/systems/physical/si/international/area.rst
@ -1,4 +1,4 @@
 Area
 ====

-.. doxygenfile:: si/international/bits/derived/area.h
+.. doxygenfile:: si/international/derived/area.h
--- a/docs_disabled/reference/systems/physical/si/international/speed.rst
+++ b/docs_disabled/reference/systems/physical/si/international/speed.rst
@ -1,4 +1,4 @@
 Speed
 =====

-.. doxygenfile:: speed/bits/derived/speed.h
+.. doxygenfile:: speed/derived/speed.h
--- a/docs_disabled/reference/systems/physical/si/international/volume.rst
+++ b/docs_disabled/reference/systems/physical/si/international/volume.rst
@ -1,4 +1,4 @@
 Volume
 ======

-.. doxygenfile:: si/international/bits/derived/volume.h
+.. doxygenfile:: si/international/derived/volume.h
--- a/docs_disabled/reference/systems/physical/si/luminous_intensity.rst
+++ b/docs_disabled/reference/systems/physical/si/luminous_intensity.rst
@ -1,4 +1,4 @@
 Luminous Intensity
 ==================

-.. doxygenfile:: si/bits/derived/luminous_intensity.h
+.. doxygenfile:: si/derived/luminous_intensity.h
--- a/docs_disabled/reference/systems/physical/si/magnetic_flux.rst
+++ b/docs_disabled/reference/systems/physical/si/magnetic_flux.rst
@ -1,4 +1,4 @@
 Magnetic Flux
 =============

-.. doxygenfile:: si/bits/derived/magnetic_flux.h
+.. doxygenfile:: si/derived/magnetic_flux.h
--- a/docs_disabled/reference/systems/physical/si/magnetic_induction.rst
+++ b/docs_disabled/reference/systems/physical/si/magnetic_induction.rst
@ -1,4 +1,4 @@
 Magnetic Induction
 ==================

-.. doxygenfile:: si/bits/derived/magnetic_induction.h
+.. doxygenfile:: si/derived/magnetic_induction.h
--- a/docs_disabled/reference/systems/physical/si/molar_energy.rst
+++ b/docs_disabled/reference/systems/physical/si/molar_energy.rst
@ -1,4 +1,4 @@
 Molar Energy
 ============

-.. doxygenfile:: si/bits/derived/molar_energy.h
+.. doxygenfile:: si/derived/molar_energy.h
--- a/docs_disabled/reference/systems/physical/si/momentum.rst
+++ b/docs_disabled/reference/systems/physical/si/momentum.rst
@ -1,4 +1,4 @@
 Momentum
 ========

-.. doxygenfile:: si/bits/derived/momentum.h
+.. doxygenfile:: si/derived/momentum.h
--- a/docs_disabled/reference/systems/physical/si/permeability.rst
+++ b/docs_disabled/reference/systems/physical/si/permeability.rst
@ -1,4 +1,4 @@
 Permeability
 ============

-.. doxygenfile:: si/bits/derived/permeability.h
+.. doxygenfile:: si/derived/permeability.h
--- a/docs_disabled/reference/systems/physical/si/permittivity.rst
+++ b/docs_disabled/reference/systems/physical/si/permittivity.rst
@ -1,4 +1,4 @@
 Permittivity
 ============

-.. doxygenfile:: si/bits/derived/permittivity.h
+.. doxygenfile:: si/derived/permittivity.h
--- a/docs_disabled/reference/systems/physical/si/power.rst
+++ b/docs_disabled/reference/systems/physical/si/power.rst
@ -1,4 +1,4 @@
 Power
 =====

-.. doxygenfile:: si/bits/derived/power.h
+.. doxygenfile:: si/derived/power.h
--- a/docs_disabled/reference/systems/physical/si/prefixes.rst
+++ b/docs_disabled/reference/systems/physical/si/prefixes.rst
@ -1,4 +1,4 @@
 Prefixes
 ========

-.. doxygenfile:: si/bits/derived/prefixes.h
+.. doxygenfile:: si/derived/prefixes.h
--- a/docs_disabled/reference/systems/physical/si/pressure.rst
+++ b/docs_disabled/reference/systems/physical/si/pressure.rst
@ -1,4 +1,4 @@
 Pressure
 ========

-.. doxygenfile:: si/bits/derived/pressure.h
+.. doxygenfile:: si/derived/pressure.h
--- a/docs_disabled/reference/systems/physical/si/resistance.rst
+++ b/docs_disabled/reference/systems/physical/si/resistance.rst
@ -1,4 +1,4 @@
 Resistance
 ==========

-.. doxygenfile:: si/bits/derived/resistance.h
+.. doxygenfile:: si/derived/resistance.h
--- a/docs_disabled/reference/systems/physical/si/speed.rst
+++ b/docs_disabled/reference/systems/physical/si/speed.rst
@ -1,4 +1,4 @@
 Speed
 =====

-.. doxygenfile:: si/bits/derived/speed.h
+.. doxygenfile:: si/derived/speed.h
--- a/docs_disabled/reference/systems/physical/si/surface_tension.rst
+++ b/docs_disabled/reference/systems/physical/si/surface_tension.rst
@ -1,4 +1,4 @@
 Surface Tension
 ===============

-.. doxygenfile:: si/bits/derived/surface_tension.h
+.. doxygenfile:: si/derived/surface_tension.h
--- a/docs_disabled/reference/systems/physical/si/thermal_conductivity.rst
+++ b/docs_disabled/reference/systems/physical/si/thermal_conductivity.rst
@ -1,4 +1,4 @@
 Thermal Conductivity
 ====================

-.. doxygenfile:: si/bits/derived/thermal_conductivity.h
+.. doxygenfile:: si/derived/thermal_conductivity.h
--- a/docs_disabled/reference/systems/physical/si/voltage.rst
+++ b/docs_disabled/reference/systems/physical/si/voltage.rst
@ -1,4 +1,4 @@
 Voltage
 =======

-.. doxygenfile:: si/bits/derived/voltage.h
+.. doxygenfile:: si/derived/voltage.h
--- a/docs_disabled/reference/systems/physical/si/volume.rst
+++ b/docs_disabled/reference/systems/physical/si/volume.rst
@ -1,4 +1,4 @@
 Volume
 ======

-.. doxygenfile:: si/bits/derived/volume.h
+.. doxygenfile:: si/derived/volume.h
--- a/example/alternative_namespaces/acceleration.h
+++ b/example/alternative_namespaces/acceleration.h
@ -1,7 +1,7 @@

 #pragma once

-#include <units/physical/si/si.h>
+#include <units/physical/si/derived/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/si.h>
+#include <units/physical/si/derived/area.h>

 namespace area {

--- a/example/alternative_namespaces/capacitor_time_curve.cpp
+++ b/example/alternative_namespaces/capacitor_time_curve.cpp
@ -20,7 +20,9 @@
    physical_quantities
 */

-#include <units/physical/si/si.h>
+#include <units/physical/si/derived/capacitance.h>
+#include <units/physical/si/derived/resistance.h>
+#include <units/physical/si/base/time.h>
 #include <units/math.h>
 #include "./voltage.h"
 #include <iostream>
--- a/example/alternative_namespaces/density.h
+++ b/example/alternative_namespaces/density.h
@ -2,7 +2,7 @@

 #pragma once

-#include <units/physical/si/si.h>
+#include <units/physical/si/derived/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/si.h>
+#include <units/physical/si/derived/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/si.h>
-#include <units/physical/si/imperial/imperial.h>
-#include <units/physical/si/international/international.h>
-#include <units/physical/si/typographic/typographic.h>
-#include <units/physical/si/us/us.h>
-#include <units/physical/si/iau/iau.h>
+#include <units/physical/si/base/length.h>
+#include <units/physical/si/imperial/base/length.h>
+#include <units/physical/si/international/base/length.h>
+#include <units/physical/si/typographic/base/length.h>
+#include <units/physical/si/us/base/length.h>
+#include <units/physical/si/iau/base/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/si.h>
+#include <units/physical/si/base/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/si.h>
+#include <units/physical/si/base/time.h>

 // named qtime due to conflict with time_t time(time_t*)
 namespace q_time {
--- a/example/alternative_namespaces/units_str.h
+++ b/example/alternative_namespaces/units_str.h
@ -1,6 +1,5 @@
 #pragma once

-#include <units/physical/dimensions.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 // get at the units text of the quantity, without its numeric value
--- a/example/alternative_namespaces/voltage.h
+++ b/example/alternative_namespaces/voltage.h
@ -2,7 +2,7 @@

 #pragma once

-#include <units/physical/si/si.h>
+#include <units/physical/si/derived/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/si.h>
+#include <units/physical/si/derived/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/cgs.h>
-#include <units/physical/si/international/international.h>
-#include <units/physical/si/si.h>
+#include <units/physical/si/cgs/derived/speed.h>
+#include <units/physical/si/international/derived/speed.h>
+#include <units/physical/si/derived/speed.h>
 #include <iostream>

 namespace {
--- a/example/box_example.cpp
+++ b/example/box_example.cpp
@ -1,4 +1,11 @@
-#include <units/physical/si/si.h>
+#include <units/physical/si/derived/acceleration.h>
+#include <units/physical/si/constants.h>
+#include <units/physical/si/derived/density.h>
+#include <units/physical/si/derived/force.h>
+#include <units/physical/si/base/length.h>
+#include <units/physical/si/base/mass.h>
+#include <units/physical/si/base/time.h>
+#include <units/physical/si/derived/volume.h>
 #include <units/format.h>
 #include <cassert>

--- a/example/capacitor_time_curve.cpp
+++ b/example/capacitor_time_curve.cpp
@ -20,7 +20,10 @@
    physical_quantities
 */

-#include <units/physical/si/si.h>
+#include <units/physical/si/derived/capacitance.h>
+#include <units/physical/si/derived/resistance.h>
+#include <units/physical/si/base/time.h>
+#include <units/physical/si/derived/voltage.h>
 #include <units/math.h>
 #include <iostream>

--- a/example/clcpp_response.cpp
+++ b/example/clcpp_response.cpp
@ -16,12 +16,15 @@
 */

 #include <units/format.h>
-#include <units/physical/si/si.h>
-#include <units/physical/si/iau/iau.h>
-#include <units/physical/si/imperial/imperial.h>
-#include <units/physical/si/international/international.h>
-#include <units/physical/si/typographic/typographic.h>
-#include <units/physical/si/us/us.h>
+#include <units/physical/si/derived/area.h>
+#include <units/physical/si/iau/base/length.h>
+#include <units/physical/si/imperial/base/length.h>
+#include <units/physical/si/international/base/length.h>
+#include <units/physical/si/base/length.h>
+#include <units/physical/si/base/time.h>
+#include <units/physical/si/typographic/base/length.h>
+#include <units/physical/si/us/base/length.h>
+#include <units/physical/si/derived/volume.h>
 #include <iostream>

 namespace {
--- 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/si.h>
+#include <units/physical/si/base/length.h>
 #include <units/format.h>
 #include <iostream>

--- a/example/experimental_angle.cpp
+++ b/example/experimental_angle.cpp
@ -22,7 +22,9 @@

 #include <units/format.h>
 #include <units/generic/angle.h>
-#include <units/physical/si/si.h>
+#include <units/physical/si/base/length.h>
+#include <units/physical/si/derived/energy.h>
+#include <units/physical/si/derived/torque.h>
 #include <iostream>

 using namespace units;
--- a/example/foot_pound_second.cpp
+++ b/example/foot_pound_second.cpp
@ -22,8 +22,17 @@

 #include <units/concepts.h>
 #include <units/format.h>
-#include <units/physical/si/fps/fps.h>
-#include <units/physical/si/si.h>
+#include <units/physical/si/fps/derived/density.h>
+#include <units/physical/si/fps/base/length.h>
+#include <units/physical/si/fps/base/mass.h>
+#include <units/physical/si/fps/derived/power.h>
+#include <units/physical/si/fps/derived/speed.h>
+#include <units/physical/si/fps/derived/volume.h>
+#include <units/physical/si/base/length.h>
+#include <units/physical/si/base/mass.h>
+#include <units/physical/si/derived/power.h>
+#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/derived/volume.h>
 #include <units/quantity.h>
 #include <iostream>

--- a/example/glide_computer.cpp
+++ b/example/glide_computer.cpp
@ -22,8 +22,8 @@

 #include <units/format.h>
 #include <units/math.h>
-#include <units/physical/si/international/international.h>
-#include <units/physical/si/si.h>
+#include <units/physical/si/international/base/length.h>
+#include <units/physical/si/derived/speed.h>
 #include <units/quantity_point.h>
 #include <array>
 #include <compare>
--- a/example/hello_units.cpp
+++ b/example/hello_units.cpp
@ -21,8 +21,8 @@
 // SOFTWARE.

 #include <units/format.h>
-#include <units/physical/si/international/international.h>
-#include <units/physical/si/si.h>
+#include <units/physical/si/international/derived/speed.h>
+#include <units/physical/si/derived/speed.h>
 #include <iostream>

 using namespace units::physical;
--- 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/si.h>
+#include <units/physical/si/derived/speed.h>
 #include <iostream>
 #include <array>

--- a/example/linear_algebra.cpp
+++ b/example/linear_algebra.cpp
@ -20,7 +20,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

-#include <units/physical/si/si.h>
+#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/derived/force.h>
+#include <units/physical/si/derived/energy.h>
 #include <units/format.h>
 #include <linear_algebra.hpp>
 #include <iostream>
--- 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/si.h>
+#include <units/physical/si/derived/acceleration.h>
 #include <cmath>
 #include <compare>
 #include <iostream>
--- a/example/total_energy.cpp
+++ b/example/total_energy.cpp
@ -20,8 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

-#include <units/physical/natural/natural.h>
-#include <units/physical/si/si.h>
+#include <units/physical/natural/constants.h>
+#include <units/physical/si/derived/energy.h>
+#include <units/physical/si/derived/momentum.h>
+#include <units/physical/si/derived/speed.h>
+#include <units/physical/si/constants.h>
 #include <units/math.h>
 #include <iostream>

--- a/example/unknown_dimension.cpp
+++ b/example/unknown_dimension.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/si.h>
+#include <units/physical/si/derived/speed.h>
 #include <iostream>

 namespace {
@ -40,7 +40,6 @@ void example()
  Time auto t1 = 10_q_s;
  Speed auto v1 = avg_speed(d1, t1);

-  // TODO: check if below is still true after adding whole SI module
  auto temp1 = v1 * 50_q_m;  // produces intermediate unknown dimension with 'unknown_coherent_unit' as its 'coherent_unit'
  Speed auto v2 = temp1 / 100_q_m; // back to known dimensions again
  Length auto d2 = v2 * 60_q_s;
--- a/src/include/units/data/data.h
+++ b/src/include/units/data/data.h
@ -22,8 +22,6 @@

 #pragma once

-#define MP_UNITS_SYSTEM_DATA
-
 #include <units/data/base/information.h>
-#include <units/data/bits/derived/bitrate.h>
+#include <units/data/derived/bitrate.h>
 #include <units/data/prefixes.h>
--- a/src/include/units/data/bits/derived/bitrate.h
+++ b/src/include/units/data/bits/derived/bitrate.h
@ -22,12 +22,6 @@

 #pragma once

-#ifndef MP_UNITS_SYSTEM_DATA
-
-#error "Please do not include this file directly. Use `units/physical/data/data.h` to prevent potential ODR violation issues."
-
-#endif
-
 #include <units/data/base/information.h>
 #include <units/derived_dimension.h>
 #include <units/physical/si/base/time.h>
--- a/src/include/units/physical/bits/dimensions.h
+++ b/src/include/units/physical/bits/dimensions.h
@ -1,73 +0,0 @@
-// 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/concepts.h>
-
-#include <units/physical/bits/absorbed_dose.h>
-#include <units/physical/bits/acceleration.h>
-#include <units/physical/bits/amount_of_substance.h>
-#include <units/physical/bits/angular_velocity.h>
-#include <units/physical/bits/area.h>
-#include <units/physical/bits/capacitance.h>
-#include <units/physical/bits/catalytic_activity.h>
-#include <units/physical/bits/charge_density.h>
-#include <units/physical/bits/concentration.h>
-#include <units/physical/bits/conductance.h>
-#include <units/physical/bits/current_density.h>
-#include <units/physical/bits/density.h>
-#include <units/physical/bits/dimensions.h>
-#include <units/physical/bits/dynamic_viscosity.h>
-#include <units/physical/bits/electric_charge.h>
-#include <units/physical/bits/electric_current.h>
-#include <units/physical/bits/electric_field_strength.h>
-#include <units/physical/bits/energy.h>
-// TODO Add when downcasting issue is solved
-// #include <units/physical/bits/energy_density.h>
-#include <units/physical/bits/force.h>
-#include <units/physical/bits/frequency.h>
-#include <units/physical/bits/heat_capacity.h>
-#include <units/physical/bits/inductance.h>
-#include <units/physical/bits/length.h>
-#include <units/physical/bits/luminance.h>
-#include <units/physical/bits/luminous_intensity.h>
-#include <units/physical/bits/magnetic_flux.h>
-#include <units/physical/bits/magnetic_induction.h>
-#include <units/physical/bits/mass.h>
-#include <units/physical/bits/molar_energy.h>
-#include <units/physical/bits/momentum.h>
-#include <units/physical/bits/permeability.h>
-#include <units/physical/bits/permittivity.h>
-#include <units/physical/bits/power.h>
-#include <units/physical/bits/pressure.h>
-// TODO Add when downcasting issue is solved
-// #include <units/physical/bits/radioactivity.h>
-#include <units/physical/bits/resistance.h>
-#include <units/physical/bits/speed.h>
-#include <units/physical/bits/surface_tension.h>
-#include <units/physical/bits/thermal_conductivity.h>
-#include <units/physical/bits/thermodynamic_temperature.h>
-#include <units/physical/bits/time.h>
-#include <units/physical/bits/torque.h>
-#include <units/physical/bits/voltage.h>
-#include <units/physical/bits/volume.h>
--- a/src/include/units/physical/dimensions.h
+++ b/src/include/units/physical/dimensions.h
@ -22,50 +22,49 @@

 #pragma once

-#include <units/physical/bits/absorbed_dose.h>
-#include <units/physical/bits/acceleration.h>
-#include <units/physical/bits/amount_of_substance.h>
-#include <units/physical/bits/angular_velocity.h>
-#include <units/physical/bits/area.h>
-#include <units/physical/bits/capacitance.h>
-#include <units/physical/bits/catalytic_activity.h>
-#include <units/physical/bits/charge_density.h>
-#include <units/physical/bits/concentration.h>
-#include <units/physical/bits/conductance.h>
-#include <units/physical/bits/current_density.h>
-#include <units/physical/bits/density.h>
-#include <units/physical/bits/dimensions.h>
-#include <units/physical/bits/dynamic_viscosity.h>
-#include <units/physical/bits/electric_charge.h>
-#include <units/physical/bits/electric_current.h>
-#include <units/physical/bits/electric_field_strength.h>
-#include <units/physical/bits/energy.h>
+#include <units/physical/dimensions/absorbed_dose.h>
+#include <units/physical/dimensions/acceleration.h>
+#include <units/physical/dimensions/amount_of_substance.h>
+#include <units/physical/dimensions/angular_velocity.h>
+#include <units/physical/dimensions/area.h>
+#include <units/physical/dimensions/capacitance.h>
+#include <units/physical/dimensions/catalytic_activity.h>
+#include <units/physical/dimensions/charge_density.h>
+#include <units/physical/dimensions/concentration.h>
+#include <units/physical/dimensions/conductance.h>
+#include <units/physical/dimensions/current_density.h>
+#include <units/physical/dimensions/density.h>
+#include <units/physical/dimensions/dynamic_viscosity.h>
+#include <units/physical/dimensions/electric_charge.h>
+#include <units/physical/dimensions/electric_current.h>
+#include <units/physical/dimensions/electric_field_strength.h>
+#include <units/physical/dimensions/energy.h>
 // TODO Add when downcasting issue is solved
-// #include <units/physical/bits/energy_density.h>
-#include <units/physical/bits/force.h>
-#include <units/physical/bits/frequency.h>
-#include <units/physical/bits/heat_capacity.h>
-#include <units/physical/bits/inductance.h>
-#include <units/physical/bits/length.h>
-#include <units/physical/bits/luminance.h>
-#include <units/physical/bits/luminous_intensity.h>
-#include <units/physical/bits/magnetic_flux.h>
-#include <units/physical/bits/magnetic_induction.h>
-#include <units/physical/bits/mass.h>
-#include <units/physical/bits/molar_energy.h>
-#include <units/physical/bits/momentum.h>
-#include <units/physical/bits/permeability.h>
-#include <units/physical/bits/permittivity.h>
-#include <units/physical/bits/power.h>
-#include <units/physical/bits/pressure.h>
+// #include <units/physical/dimensions/energy_density.h>
+#include <units/physical/dimensions/force.h>
+#include <units/physical/dimensions/frequency.h>
+#include <units/physical/dimensions/heat_capacity.h>
+#include <units/physical/dimensions/inductance.h>
+#include <units/physical/dimensions/length.h>
+#include <units/physical/dimensions/luminance.h>
+#include <units/physical/dimensions/luminous_intensity.h>
+#include <units/physical/dimensions/magnetic_flux.h>
+#include <units/physical/dimensions/magnetic_induction.h>
+#include <units/physical/dimensions/mass.h>
+#include <units/physical/dimensions/molar_energy.h>
+#include <units/physical/dimensions/momentum.h>
+#include <units/physical/dimensions/permeability.h>
+#include <units/physical/dimensions/permittivity.h>
+#include <units/physical/dimensions/power.h>
+#include <units/physical/dimensions/pressure.h>
 // TODO Add when downcasting issue is solved
-// #include <units/physical/bits/radioactivity.h>
-#include <units/physical/bits/resistance.h>
-#include <units/physical/bits/speed.h>
-#include <units/physical/bits/surface_tension.h>
-#include <units/physical/bits/thermal_conductivity.h>
-#include <units/physical/bits/thermodynamic_temperature.h>
-#include <units/physical/bits/time.h>
-#include <units/physical/bits/torque.h>
-#include <units/physical/bits/voltage.h>
-#include <units/physical/bits/volume.h>
+// #include <units/physical/dimensions/radioactivity.h>
+#include <units/physical/dimensions/resistance.h>
+#include <units/physical/dimensions/speed.h>
+#include <units/physical/dimensions/surface_tension.h>
+#include <units/physical/dimensions/thermal_conductivity.h>
+#include <units/physical/dimensions/thermodynamic_temperature.h>
+#include <units/physical/dimensions/time.h>
+#include <units/physical/dimensions/torque.h>
+#include <units/physical/dimensions/voltage.h>
+#include <units/physical/dimensions/volume.h>
--- a/src/include/units/physical/dimensions/absorbed_dose.h
+++ b/src/include/units/physical/dimensions/absorbed_dose.h
@ -23,8 +23,8 @@
 #pragma once

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/acceleration.h
+++ b/src/include/units/physical/dimensions/acceleration.h
@ -23,8 +23,8 @@
 #pragma once

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/amount_of_substance.h
+++ b/src/include/units/physical/dimensions/amount_of_substance.h
--- a/src/include/units/physical/dimensions/angular_velocity.h
+++ b/src/include/units/physical/dimensions/angular_velocity.h
@ -24,7 +24,7 @@

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/area.h
+++ b/src/include/units/physical/dimensions/area.h
@ -23,7 +23,7 @@
 #pragma once

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/capacitance.h
+++ b/src/include/units/physical/dimensions/capacitance.h
@ -23,8 +23,8 @@
 #pragma once

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/catalytic_activity.h
+++ b/src/include/units/physical/dimensions/catalytic_activity.h
@ -22,9 +22,9 @@

 #pragma once

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/charge_density.h
+++ b/src/include/units/physical/dimensions/charge_density.h
@ -23,8 +23,8 @@
 #pragma once

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/concentration.h
+++ b/src/include/units/physical/dimensions/concentration.h
@ -23,8 +23,8 @@
 #pragma once

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/conductance.h
+++ b/src/include/units/physical/dimensions/conductance.h
@ -23,7 +23,7 @@
 #pragma once

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/current_density.h
+++ b/src/include/units/physical/dimensions/current_density.h
@ -23,8 +23,8 @@
 #pragma once

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/density.h
+++ b/src/include/units/physical/dimensions/density.h
@ -23,8 +23,8 @@
 #pragma once

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/dynamic_viscosity.h
+++ b/src/include/units/physical/dimensions/dynamic_viscosity.h
@ -23,8 +23,8 @@
 #pragma once

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/electric_charge.h
+++ b/src/include/units/physical/dimensions/electric_charge.h
@ -23,8 +23,8 @@
 #pragma once

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

 namespace units::physical {

--- a/src/include/units/physical/dimensions/electric_current.h
+++ b/src/include/units/physical/dimensions/electric_current.h
--- a/src/include/units/physical/dimensions/electric_field_strength.h
+++ b/src/include/units/physical/dimensions/electric_field_strength.h
@ -23,8 +23,8 @@
 #pragma once

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

 namespace units::physical {

--- a/Show More
+++ b/Show More