refactor: Refactored the library file tree

Resolves #249

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{

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 {
 

example/alternative_namespaces/capacitor_time_curve.cpp

@@ -20,9 +20,9 @@
     physical_quantities
 */
 
-#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/capacitance.h>
+#include <units/physical/si/resistance.h>
+#include <units/physical/si/time.h>
 #include <units/math.h>
 #include <units/quantity_io.h>
 #include "./voltage.h"

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{

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{

example/alternative_namespaces/length.h

@@ -2,12 +2,12 @@
 
 #pragma once
 
-#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>
+#include <units/physical/si/length.h>
+#include <units/physical/si/imperial/length.h>
+#include <units/physical/si/international/length.h>
+#include <units/physical/si/typographic/length.h>
+#include <units/physical/si/us/length.h>
+#include <units/physical/si/iau/length.h>
 
 namespace units{
 namespace experimental{

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{

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 {

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{

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{

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

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/derived/speed.h>
-#include <units/physical/si/derived/density.h>
-#include <units/physical/si/derived/force.h>
-#include <units/physical/si/base/mass.h>
-#include <units/physical/si/base/time.h>
-#include <units/physical/si/derived/volume.h>
+#include <units/physical/si/area.h>
+#include <units/physical/si/speed.h>
+#include <units/physical/si/density.h>
+#include <units/physical/si/force.h>
+#include <units/physical/si/mass.h>
+#include <units/physical/si/time.h>
+#include <units/physical/si/volume.h>
 #include <units/format.h>
 #include <cassert>
 #include <iostream>

example/capacitor_time_curve.cpp

@@ -20,10 +20,10 @@
     physical_quantities
 */
 
-#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/physical/si/capacitance.h>
+#include <units/physical/si/resistance.h>
+#include <units/physical/si/time.h>
+#include <units/physical/si/voltage.h>
 #include <units/math.h>
 #include <units/quantity_io.h>
 #include <iostream>

example/clcpp_response.cpp

@@ -16,15 +16,15 @@
 */
 
 #include <units/format.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 <units/physical/si/area.h>
+#include <units/physical/si/iau/length.h>
+#include <units/physical/si/imperial/length.h>
+#include <units/physical/si/international/length.h>
+#include <units/physical/si/length.h>
+#include <units/physical/si/time.h>
+#include <units/physical/si/typographic/length.h>
+#include <units/physical/si/us/length.h>
+#include <units/physical/si/volume.h>
 #include <units/quantity_io.h>
 #include <iostream>
 

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>

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/derived/energy.h>
-#include <units/physical/si/derived/torque.h>
+#include <units/physical/si/length.h>
+#include <units/physical/si/energy.h>
+#include <units/physical/si/torque.h>
 #include <units/quantity_io.h>
 #include <iostream>
 

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/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/physical/si/fps/density.h>
+#include <units/physical/si/fps/length.h>
+#include <units/physical/si/fps/mass.h>
+#include <units/physical/si/fps/power.h>
+#include <units/physical/si/fps/speed.h>
+#include <units/physical/si/fps/volume.h>
+#include <units/physical/si/length.h>
+#include <units/physical/si/mass.h>
+#include <units/physical/si/power.h>
+#include <units/physical/si/speed.h>
+#include <units/physical/si/volume.h>
 #include <units/quantity.h>
 #include <iostream>
 

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>
 

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/international/base/length.h>
+#include <units/physical/si/speed.h>
+#include <units/physical/si/international/length.h>
 #include <units/quantity_point_kind.h>
 
 // An example of a really simplified tactical glide computer

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

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>
 

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/derived/force.h>
-#include <units/physical/si/derived/energy.h>
+#include <units/physical/si/speed.h>
+#include <units/physical/si/force.h>
+#include <units/physical/si/energy.h>
 #include <units/format.h>
 #include <units/quantity_io.h>
 #include <linear_algebra.hpp>

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>

example/total_energy.cpp

@@ -21,9 +21,9 @@
 // SOFTWARE.
 
 #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/energy.h>
+#include <units/physical/si/momentum.h>
+#include <units/physical/si/speed.h>
 #include <units/physical/si/constants.h>
 #include <units/math.h>
 #include <units/quantity_io.h>

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