diff --git a/samples/blackmisc/main.cpp b/samples/blackmisc/main.cpp
index 41dcc5386..484ce8597 100644
--- a/samples/blackmisc/main.cpp
+++ b/samples/blackmisc/main.cpp
@@ -17,7 +17,7 @@
 #include "samplesalgorithm.h"
 #include "samplesconcurrent.h"
 #include "blackmisc/blackmiscfreefunctions.h"
-#include "blackmisc/pqallquantities.h"
+#include "blackmisc/pq/pq.h"
 
 using namespace BlackMisc;
 using namespace BlackMiscTest;
diff --git a/samples/blackmisc/sampleschangeobject.cpp b/samples/blackmisc/sampleschangeobject.cpp
index bfc644d61..302135c39 100644
--- a/samples/blackmisc/sampleschangeobject.cpp
+++ b/samples/blackmisc/sampleschangeobject.cpp
@@ -8,7 +8,7 @@
  */
 
 #include "sampleschangeobject.h"
-#include "blackmisc/pqconstants.h"
+#include "blackmisc/pq/constants.h"
 #include "blackmisc/aviation/heading.h"
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/navsystem.h"
diff --git a/samples/blackmisc/samplesvariant.cpp b/samples/blackmisc/samplesvariant.cpp
index ea44ef693..c0d5476f1 100644
--- a/samples/blackmisc/samplesvariant.cpp
+++ b/samples/blackmisc/samplesvariant.cpp
@@ -9,7 +9,7 @@
 
 #include "samplesvariant.h"
 #include "blackmisc/variant.h"
-#include "blackmisc/pqallquantities.h"
+#include "blackmisc/pq/pq.h"
 #include "blackmisc/aviation/aviation.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/blackmiscfreefunctions.h"
diff --git a/samples/blackmiscdbus/testservice.h b/samples/blackmiscdbus/testservice.h
index fdc2cfb39..11054c773 100644
--- a/samples/blackmiscdbus/testservice.h
+++ b/samples/blackmiscdbus/testservice.h
@@ -18,7 +18,7 @@
 
 #include "blackmisc/aviation/aviation.h"
 #include "blackmisc/networkallclasses.h"
-#include "blackmisc/pqallquantities.h"
+#include "blackmisc/pq/pq.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/math/math.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
diff --git a/samples/blackmiscquantities/samplesaviation.cpp b/samples/blackmiscquantities/samplesaviation.cpp
index 05cf8a395..f03c1c416 100644
--- a/samples/blackmiscquantities/samplesaviation.cpp
+++ b/samples/blackmiscquantities/samplesaviation.cpp
@@ -8,7 +8,7 @@
  */
 
 #include "samplesaviation.h"
-#include "blackmisc/pqconstants.h"
+#include "blackmisc/pq/constants.h"
 #include "blackmisc/aviation/heading.h"
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/navsystem.h"
diff --git a/samples/blackmiscquantities/samplesphysicalquantities.h b/samples/blackmiscquantities/samplesphysicalquantities.h
index 032edef92..433ddd080 100644
--- a/samples/blackmiscquantities/samplesphysicalquantities.h
+++ b/samples/blackmiscquantities/samplesphysicalquantities.h
@@ -12,7 +12,7 @@
 #ifndef BLACKMISCTEST_SAMPLESPHYSICALQUANTITIES_H
 #define BLACKMISCTEST_SAMPLESPHYSICALQUANTITIES_H
 
-#include "blackmisc/pqconstants.h"
+#include "blackmisc/pq/constants.h"
 #include <QDebug>
 #include <QTextStream>
 
diff --git a/src/blackcore/airspace_watchdog.h b/src/blackcore/airspace_watchdog.h
index c1b530c19..e87ff1426 100644
--- a/src/blackcore/airspace_watchdog.h
+++ b/src/blackcore/airspace_watchdog.h
@@ -12,7 +12,7 @@
 #ifndef BLACKCORE_AIRSPACE_WATCHDOG_H
 #define BLACKCORE_AIRSPACE_WATCHDOG_H
 
-#include "blackmisc/pqtime.h"
+#include "blackmisc/pq/time.h"
 #include "blackmisc/aviation/callsign.h"
 #include <QObject>
 #include <QHash>
diff --git a/src/blackcore/context_simulator.h b/src/blackcore/context_simulator.h
index 631657352..6606df92c 100644
--- a/src/blackcore/context_simulator.h
+++ b/src/blackcore/context_simulator.h
@@ -34,7 +34,7 @@
 #include "blackmisc/aviation/airportlist.h"
 #include "blackmisc/project.h"
 #include "blackmisc/pixmap.h"
-#include "blackmisc/pqtime.h"
+#include "blackmisc/pq/time.h"
 #include <QObject>
 
 namespace BlackCore
diff --git a/src/blackcore/network.h b/src/blackcore/network.h
index e5430f209..4fdbb9e21 100644
--- a/src/blackcore/network.h
+++ b/src/blackcore/network.h
@@ -14,10 +14,10 @@
 
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/aviation/aircraft.h"
-#include "blackmisc/pqfrequency.h"
+#include "blackmisc/pq/frequency.h"
 #include "blackmisc/geo/coordinategeodetic.h"
-#include "blackmisc/pqlength.h"
-#include "blackmisc/pqtime.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/time.h"
 #include "blackmisc/nwserverlist.h"
 #include "blackmisc/nwtextmessagelist.h"
 #include "blackmisc/aviation/informationmessage.h"
diff --git a/src/blackcore/token_bucket.h b/src/blackcore/token_bucket.h
index 2b0c0c5c6..e7c6419c2 100644
--- a/src/blackcore/token_bucket.h
+++ b/src/blackcore/token_bucket.h
@@ -10,7 +10,7 @@
 #ifndef BLACKCORE_TOKENBUCKET_H
 #define BLACKCORE_TOKENBUCKET_H
 
-#include "blackmisc/pqtime.h"
+#include "blackmisc/pq/time.h"
 #include <QtGlobal>
 #include <QDateTime>
 
diff --git a/src/blackgui/models/columnformatters.h b/src/blackgui/models/columnformatters.h
index a1d7ececc..0ce3f3112 100644
--- a/src/blackgui/models/columnformatters.h
+++ b/src/blackgui/models/columnformatters.h
@@ -13,7 +13,7 @@
 #define BLACKGUI_COLUMNFORMATTERS_H
 
 #include "blackgui/led.h"
-#include "blackmisc/pqallquantities.h"
+#include "blackmisc/pq/pq.h"
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/icon.h"
diff --git a/src/blackmisc/aviation/aircraft.cpp b/src/blackmisc/aviation/aircraft.cpp
index 2b675d12f..3c12fbcdb 100644
--- a/src/blackmisc/aviation/aircraft.cpp
+++ b/src/blackmisc/aviation/aircraft.cpp
@@ -9,7 +9,7 @@
 
 #include "blackmisc/aviation/aircraft.h"
 #include "blackmisc/blackmiscfreefunctions.h"
-#include "blackmisc/pqconstants.h"
+#include "blackmisc/pq/constants.h"
 #include "blackmisc/icon.h"
 #include "blackmisc/propertyindex.h"
 
diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h
index 2bf8de578..8672a5c7e 100644
--- a/src/blackmisc/aviation/aircraftsituation.h
+++ b/src/blackmisc/aviation/aircraftsituation.h
@@ -17,7 +17,7 @@
 #include "blackmisc/aviation/altitude.h"
 #include "blackmisc/aviation/heading.h"
 #include "blackmisc/aviation/callsign.h"
-#include "blackmisc/pqspeed.h"
+#include "blackmisc/pq/speed.h"
 #include "blackmisc/valueobject.h"
 #include <QDateTime>
 
diff --git a/src/blackmisc/aviation/altitude.cpp b/src/blackmisc/aviation/altitude.cpp
index 9d05cd03e..73d49644b 100644
--- a/src/blackmisc/aviation/altitude.cpp
+++ b/src/blackmisc/aviation/altitude.cpp
@@ -8,7 +8,7 @@
  */
 
 #include "blackmisc/aviation/altitude.h"
-#include "blackmisc/pqstring.h"
+#include "blackmisc/pq/pqstring.h"
 #include "blackmisc/iconlist.h"
 
 using BlackMisc::PhysicalQuantities::CLength;
diff --git a/src/blackmisc/aviation/altitude.h b/src/blackmisc/aviation/altitude.h
index ed43c1153..c50ab5741 100644
--- a/src/blackmisc/aviation/altitude.h
+++ b/src/blackmisc/aviation/altitude.h
@@ -12,7 +12,7 @@
 #ifndef BLACKMISC_AVIATION_ALTITUDE_H
 #define BLACKMISC_AVIATION_ALTITUDE_H
 
-#include "blackmisc/pqlength.h"
+#include "blackmisc/pq/length.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h
index 4b2c1322b..24103342e 100644
--- a/src/blackmisc/aviation/atcstation.h
+++ b/src/blackmisc/aviation/atcstation.h
@@ -18,9 +18,9 @@
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/nwuser.h"
 #include "blackmisc/geo/coordinategeodetic.h"
-#include "blackmisc/pqfrequency.h"
-#include "blackmisc/pqlength.h"
-#include "blackmisc/pqtime.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/time.h"
 #include <QDateTime>
 #include <QMap>
 #include <functional>
diff --git a/src/blackmisc/aviation/avionicsbase.h b/src/blackmisc/aviation/avionicsbase.h
index 1588d38d0..150e969f3 100644
--- a/src/blackmisc/aviation/avionicsbase.h
+++ b/src/blackmisc/aviation/avionicsbase.h
@@ -9,7 +9,7 @@
 //! \file
 
 #include "blackmisc/valueobject.h"
-#include "blackmisc/pqconstants.h"
+#include "blackmisc/pq/constants.h"
 #include <QtGlobal>
 
 namespace BlackMisc
diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h
index 19da76803..d7cf971b4 100644
--- a/src/blackmisc/aviation/flightplan.h
+++ b/src/blackmisc/aviation/flightplan.h
@@ -15,8 +15,8 @@
 #include "blackmisc/valueobject.h"
 #include "blackmisc/aviation/altitude.h"
 #include "blackmisc/aviation/airporticao.h"
-#include "blackmisc/pqtime.h"
-#include "blackmisc/pqspeed.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/pq/speed.h"
 #include <QDateTime>
 
 namespace BlackMisc
diff --git a/src/blackmisc/aviation/heading.h b/src/blackmisc/aviation/heading.h
index 586bcf04b..2cf953e74 100644
--- a/src/blackmisc/aviation/heading.h
+++ b/src/blackmisc/aviation/heading.h
@@ -12,7 +12,7 @@
 #ifndef BLACKMISC_AVIATION_HEADING_H
 #define BLACKMISC_AVIATION_HEADING_H
 
-#include "blackmisc/pqangle.h"
+#include "blackmisc/pq/angle.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/aviation/selcal.h b/src/blackmisc/aviation/selcal.h
index dadd30b04..7dee7d653 100644
--- a/src/blackmisc/aviation/selcal.h
+++ b/src/blackmisc/aviation/selcal.h
@@ -12,7 +12,7 @@
 #ifndef BLACKMISC_AVIATION_SELCAL_H
 #define BLACKMISC_AVIATION_SELCAL_H
 
-#include "blackmisc/pqfrequency.h"
+#include "blackmisc/pq/frequency.h"
 #include "blackmisc/valueobject.h"
 
 namespace BlackMisc
diff --git a/src/blackmisc/aviation/track.h b/src/blackmisc/aviation/track.h
index 9e6f46c4f..44355a1fe 100644
--- a/src/blackmisc/aviation/track.h
+++ b/src/blackmisc/aviation/track.h
@@ -12,7 +12,7 @@
 #ifndef BLACKMISC_AVIATION_TRACK_H
 #define BLACKMISC_AVIATION_TRACK_H
 
-#include "blackmisc/pqangle.h"
+#include "blackmisc/pq/angle.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/blackmisc.h b/src/blackmisc/blackmisc.h
index 593b200b5..dadd8b29c 100644
--- a/src/blackmisc/blackmisc.h
+++ b/src/blackmisc/blackmisc.h
@@ -23,11 +23,6 @@
  * \brief Position handling as geo locations and coordinates systems.
  */
 
-/*!
- * \namespace BlackMisc::PhysicalQuantities
- * \brief Classes for physical quantities and units such as length, mass, speed.
- */
-
 /*!
  * \namespace BlackMisc::Network
  * \brief Classes related to the traffic network such as VATSIM user etc.
diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro
index 5e7d649fd..058e88a07 100644
--- a/src/blackmisc/blackmisc.pro
+++ b/src/blackmisc/blackmisc.pro
@@ -24,6 +24,7 @@ TRANSLATIONS += translations/blackmisc_i18n_de.ts \
                 translations/blackmisc_i18n_en.ts
 
 HEADERS +=  *.h \
+            $$PWD/pq/*.h \
             $$PWD/aviation/*.h \
             $$PWD/math/*.h \
             $$PWD/geo/*.h \
@@ -33,6 +34,7 @@ HEADERS +=  *.h \
             $$PWD/simulation/fsx\*.h
 
 SOURCES +=  *.cpp \
+            $$PWD/pq/*.cpp \
             $$PWD/aviation/*.cpp \
             $$PWD/math/*.cpp \
             $$PWD/geo/*.cpp \
diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp
index fb321d341..d05901172 100644
--- a/src/blackmisc/blackmiscfreefunctions.cpp
+++ b/src/blackmisc/blackmiscfreefunctions.cpp
@@ -9,7 +9,7 @@
 
 #include "blackmiscfreefunctions.h"
 #include "blackmisc/aviation/aviation.h"
-#include "pqallquantities.h"
+#include "blackmisc/pq/pq.h"
 #include "math/math.h"
 #include "geo/geo.h"
 #include "networkallclasses.h"
diff --git a/src/blackmisc/blackmiscfreefunctions_pqmeta.cpp b/src/blackmisc/blackmiscfreefunctions_pqmeta.cpp
index 06c133a77..c4c53c93c 100644
--- a/src/blackmisc/blackmiscfreefunctions_pqmeta.cpp
+++ b/src/blackmisc/blackmiscfreefunctions_pqmeta.cpp
@@ -8,7 +8,7 @@
  */
 
 #include "blackmiscfreefunctions.h"
-#include "pqallquantities.h"
+#include "blackmisc/pq/pq.h"
 
 /*
  * Metadata for PQs
diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h
index 0e8ab0762..98d92c842 100644
--- a/src/blackmisc/geo/coordinategeodetic.h
+++ b/src/blackmisc/geo/coordinategeodetic.h
@@ -14,7 +14,7 @@
 
 #include "blackmisc/geo/latitude.h"
 #include "blackmisc/geo/longitude.h"
-#include "blackmisc/pqlength.h"
+#include "blackmisc/pq/length.h"
 #include "blackmisc/propertyindex.h"
 
 namespace BlackMisc
diff --git a/src/blackmisc/geo/earthangle.h b/src/blackmisc/geo/earthangle.h
index d5d9f1d3e..a7fcf36f4 100644
--- a/src/blackmisc/geo/earthangle.h
+++ b/src/blackmisc/geo/earthangle.h
@@ -12,7 +12,7 @@
 #ifndef BLACKMISC_GEO_EARTHANGLE_H
 #define BLACKMISC_GEO_EARTHANGLE_H
 
-#include "blackmisc/pqangle.h"
+#include "blackmisc/pq/angle.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/icon.cpp b/src/blackmisc/icon.cpp
index 5cb221147..1f4001cd9 100644
--- a/src/blackmisc/icon.cpp
+++ b/src/blackmisc/icon.cpp
@@ -8,7 +8,7 @@
  */
 
 #include "icon.h"
-#include "pqangle.h"
+#include "blackmisc/pq/angle.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/nwtextmessage.cpp b/src/blackmisc/nwtextmessage.cpp
index e88690293..6981f22a7 100644
--- a/src/blackmisc/nwtextmessage.cpp
+++ b/src/blackmisc/nwtextmessage.cpp
@@ -9,7 +9,7 @@
 
 #include "nwtextmessage.h"
 #include "blackmisc/blackmiscfreefunctions.h"
-#include "blackmisc/pqconstants.h"
+#include "blackmisc/pq/constants.h"
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/selcal.h"
diff --git a/src/blackmisc/nwtextmessage.h b/src/blackmisc/nwtextmessage.h
index f446ff9af..2a3878bf9 100644
--- a/src/blackmisc/nwtextmessage.h
+++ b/src/blackmisc/nwtextmessage.h
@@ -13,7 +13,7 @@
 #define BLACKMISC_TEXTMESSAGE_H
 
 #include "blackmisc/timestampbased.h"
-#include "pqfrequency.h"
+#include "blackmisc/pq/frequency.h"
 #include "blackmisc/aviation/callsign.h"
 #include "statusmessage.h"
 #include "valueobject.h"
diff --git a/src/blackmisc/pqacceleration.h b/src/blackmisc/pq/acceleration.h
similarity index 91%
rename from src/blackmisc/pqacceleration.h
rename to src/blackmisc/pq/acceleration.h
index 5c2f9b14d..35c91a8f5 100644
--- a/src/blackmisc/pqacceleration.h
+++ b/src/blackmisc/pq/acceleration.h
@@ -9,10 +9,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_PQACCELERATION_H
-#define BLACKMISC_PQACCELERATION_H
+#ifndef BLACKMISC_PQ_ACCELERATION_H
+#define BLACKMISC_PQ_ACCELERATION_H
 
-#include "blackmisc/pqphysicalquantity.h"
+#include "blackmisc/pq/physicalquantity.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/pqangle.cpp b/src/blackmisc/pq/angle.cpp
similarity index 94%
rename from src/blackmisc/pqangle.cpp
rename to src/blackmisc/pq/angle.cpp
index 68ca6a63e..3495aa308 100644
--- a/src/blackmisc/pqangle.cpp
+++ b/src/blackmisc/pq/angle.cpp
@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "iconlist.h"
-#include "pqangle.h"
+#include "blackmisc/iconlist.h"
+#include "blackmisc/pq/angle.h"
 #include "blackmisc/aviation/heading.h"
 
 namespace BlackMisc
diff --git a/src/blackmisc/pqangle.h b/src/blackmisc/pq/angle.h
similarity index 95%
rename from src/blackmisc/pqangle.h
rename to src/blackmisc/pq/angle.h
index 348dd5a1e..e00617858 100644
--- a/src/blackmisc/pqangle.h
+++ b/src/blackmisc/pq/angle.h
@@ -9,10 +9,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_PQANGLE_H
-#define BLACKMISC_PQANGLE_H
+#ifndef BLACKMISC_PQ_ANGLE_H
+#define BLACKMISC_PQ_ANGLE_H
 
-#include "blackmisc/pqphysicalquantity.h"
+#include "blackmisc/pq/physicalquantity.h"
 #include "blackmisc/math/mathutils.h"
 
 namespace BlackMisc
diff --git a/src/blackmisc/pqconstants.h b/src/blackmisc/pq/constants.h
similarity index 96%
rename from src/blackmisc/pqconstants.h
rename to src/blackmisc/pq/constants.h
index 7ac67b749..d2d84ff75 100644
--- a/src/blackmisc/pqconstants.h
+++ b/src/blackmisc/pq/constants.h
@@ -9,10 +9,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_PQCONSTANTS_H
-#define BLACKMISC_PQCONSTANTS_H
+#ifndef BLACKMISC_PQ_CONSTANTS_H
+#define BLACKMISC_PQ_CONSTANTS_H
 
-#include "blackmisc/pqallquantities.h"
+#include "blackmisc/pq/pq.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/pqfrequency.h b/src/blackmisc/pq/frequency.h
similarity index 92%
rename from src/blackmisc/pqfrequency.h
rename to src/blackmisc/pq/frequency.h
index 9a3de4fcd..d5de40db1 100644
--- a/src/blackmisc/pqfrequency.h
+++ b/src/blackmisc/pq/frequency.h
@@ -9,10 +9,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_PQFREQUENCY_H
-#define BLACKMISC_PQFREQUENCY_H
+#ifndef BLACKMISC_PQ_FREQUENCY_H
+#define BLACKMISC_PQ_FREQUENCY_H
 
-#include "pqphysicalquantity.h"
+#include "blackmisc/pq/physicalquantity.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/pqlength.h b/src/blackmisc/pq/length.h
similarity index 91%
rename from src/blackmisc/pqlength.h
rename to src/blackmisc/pq/length.h
index 34de9e2e2..9a47f6cad 100644
--- a/src/blackmisc/pqlength.h
+++ b/src/blackmisc/pq/length.h
@@ -9,10 +9,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_PQLENGTH_H
-#define BLACKMISC_PQLENGTH_H
+#ifndef BLACKMISC_PQ_LENGTH_H
+#define BLACKMISC_PQ_LENGTH_H
 
-#include "blackmisc/pqphysicalquantity.h"
+#include "blackmisc/pq/physicalquantity.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/pqmass.h b/src/blackmisc/pq/mass.h
similarity index 91%
rename from src/blackmisc/pqmass.h
rename to src/blackmisc/pq/mass.h
index 7f2712d93..46dee0485 100644
--- a/src/blackmisc/pqmass.h
+++ b/src/blackmisc/pq/mass.h
@@ -9,10 +9,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_PQMASS_H
-#define BLACKMISC_PQMASS_H
+#ifndef BLACKMISC_PQ_MASS_H
+#define BLACKMISC_PQ_MASS_H
 
-#include "blackmisc/pqphysicalquantity.h"
+#include "blackmisc/pq/physicalquantity.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/pqbase.cpp b/src/blackmisc/pq/measurementunit.cpp
similarity index 84%
rename from src/blackmisc/pqbase.cpp
rename to src/blackmisc/pq/measurementunit.cpp
index fe052325d..95cc5c675 100644
--- a/src/blackmisc/pqbase.cpp
+++ b/src/blackmisc/pq/measurementunit.cpp
@@ -9,7 +9,7 @@
 
 //! \file
 
-#include "blackmisc/pqbase.h"
+#include "blackmisc/pq/measurementunit.h"
 #include "blackmisc/math/mathutils.h"
 
 using namespace BlackMisc::Math;
@@ -18,26 +18,18 @@ namespace BlackMisc
 {
     namespace PhysicalQuantities
     {
-        /*
-         * Equal operator
-         */
+
         bool CMeasurementUnit::operator ==(const CMeasurementUnit &other) const
         {
             if (this == &other) return true;
             return this->m_name == other.m_name;
         }
 
-        /*
-         * Unequal operator
-         */
         bool CMeasurementUnit::operator !=(const CMeasurementUnit &other) const
         {
             return !(other == *this);
         }
 
-        /*
-         * Conversion
-         */
         double CMeasurementUnit::convertFrom(double value, const CMeasurementUnit &unit) const
         {
             if (this->isNull() || unit.isNull()) return 0;
@@ -45,27 +37,17 @@ namespace BlackMisc
             return this->m_converter->fromDefault(unit.m_converter->toDefault(value));
         }
 
-        /*
-         * Value to QString with unit, e.g. "5.00m"
-         * @return
-         */
         QString CMeasurementUnit::makeRoundedQStringWithUnit(double value, int digits, bool i18n) const
         {
             return this->makeRoundedQString(value, digits).append(this->getSymbol(i18n));
         }
 
-        /*
-         * Value rounded
-         */
         double CMeasurementUnit::roundValue(double value, int digits) const
         {
             if (digits < 0) digits = this->m_displayDigits;
             return CMathUtils::round(value, digits);
         }
 
-        /*
-         * Rounded to QString
-         */
         QString CMeasurementUnit::makeRoundedQString(double value, int digits, bool /* i18n */) const
         {
             if (digits < 0) digits = this->m_displayDigits;
diff --git a/src/blackmisc/pqbase.h b/src/blackmisc/pq/measurementunit.h
similarity index 99%
rename from src/blackmisc/pqbase.h
rename to src/blackmisc/pq/measurementunit.h
index 6d934dd51..7eb5be9fd 100644
--- a/src/blackmisc/pqbase.h
+++ b/src/blackmisc/pq/measurementunit.h
@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKMISC_PQBASE_H
-#define BLACKMISC_PQBASE_H
+#ifndef BLACKMISC_PQ_MEASUREMENTUNIT_H
+#define BLACKMISC_PQ_MEASUREMENTUNIT_H
 
 #include "blackmisc/valueobject.h"
 #include "blackmisc/math/mathutils.h"
diff --git a/src/blackmisc/pqphysicalquantity.cpp b/src/blackmisc/pq/physicalquantity.cpp
similarity index 86%
rename from src/blackmisc/pqphysicalquantity.cpp
rename to src/blackmisc/pq/physicalquantity.cpp
index 5a7b0652a..16f9388ae 100644
--- a/src/blackmisc/pqphysicalquantity.cpp
+++ b/src/blackmisc/pq/physicalquantity.cpp
@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "blackmisc/pqallquantities.h"
-#include "blackmiscfreefunctions.h"
+#include "blackmisc/pq/pq.h"
+#include "blackmisc/blackmiscfreefunctions.h"
 #include <QCoreApplication>
 
 namespace BlackMisc
@@ -16,18 +16,10 @@ namespace BlackMisc
     namespace PhysicalQuantities
     {
 
-        /*
-         * Constructor by double
-         */
         template <class MU, class PQ> CPhysicalQuantity<MU, PQ>::CPhysicalQuantity(double value, const MU &unit) :
             m_value(unit.isNull() ? 0.0 : value), m_unit(unit)
-        {
-            // void
-        }
+        { }
 
-        /*
-         * Equal operator ==
-         */
         template <class MU, class PQ> bool CPhysicalQuantity<MU, PQ>::operator ==(const CPhysicalQuantity<MU, PQ> &other) const
         {
             if (this == &other) return true;
@@ -39,26 +31,17 @@ namespace BlackMisc
             return diff <= this->m_unit.getEpsilon();
         }
 
-        /*
-         * Not equal
-         */
         template <class MU, class PQ> bool CPhysicalQuantity<MU, PQ>::operator !=(const CPhysicalQuantity<MU, PQ> &other) const
         {
             return !((*this) == other);
         }
 
-        /*
-         * Plus operator
-         */
         template <class MU, class PQ> CPhysicalQuantity<MU, PQ> &CPhysicalQuantity<MU, PQ>::operator +=(const CPhysicalQuantity<MU, PQ> &other)
         {
             this->m_value += other.value(this->m_unit);
             return *this;
         }
 
-        /*
-         * Plus operator
-         */
         template <class MU, class PQ> PQ CPhysicalQuantity<MU, PQ>::operator +(const PQ &other) const
         {
             PQ copy(other);
@@ -66,34 +49,22 @@ namespace BlackMisc
             return copy;
         }
 
-        /*
-         * Explicit plus
-         */
         template <class MU, class PQ> void CPhysicalQuantity<MU, PQ>::addValueSameUnit(double value)
         {
             this->m_value += value;
         }
 
-        /*
-         * Explicit minus
-         */
         template <class MU, class PQ> void CPhysicalQuantity<MU, PQ>::substractValueSameUnit(double value)
         {
             this->m_value -= value;
         }
 
-        /*
-         * Minus operator
-         */
         template <class MU, class PQ> CPhysicalQuantity<MU, PQ> &CPhysicalQuantity<MU, PQ>::operator -=(const CPhysicalQuantity<MU, PQ> &other)
         {
             this->m_value -= other.value(this->m_unit);
             return *this;
         }
 
-        /*
-         * Minus operator
-         */
         template <class MU, class PQ> PQ CPhysicalQuantity<MU, PQ>::operator -(const PQ &other) const
         {
             PQ copy = *derived();
@@ -101,9 +72,6 @@ namespace BlackMisc
             return copy;
         }
 
-        /*
-         * Marshall
-         */
         template <class MU, class PQ> void CPhysicalQuantity<MU, PQ>::marshallToDbus(QDBusArgument &argument) const
         {
             argument << this->value(UnitClass::defaultUnit());
@@ -111,9 +79,6 @@ namespace BlackMisc
             argument << this->m_unit;
         }
 
-        /*
-         * Unmarshall
-         */
         template <class MU, class PQ> void CPhysicalQuantity<MU, PQ>::unmarshallFromDbus(const QDBusArgument &argument)
         {
             double ignore;
@@ -122,18 +87,12 @@ namespace BlackMisc
             argument >> this->m_unit;
         }
 
-        /*
-         * Multiply operator
-         */
         template <class MU, class PQ> CPhysicalQuantity<MU, PQ> &CPhysicalQuantity<MU, PQ>::operator *=(double factor)
         {
             this->m_value *= factor;
             return *this;
         }
 
-        /*
-         * Multiply operator
-         */
         template <class MU, class PQ> PQ CPhysicalQuantity<MU, PQ>::operator *(double factor) const
         {
             PQ copy = *derived();
@@ -141,18 +100,12 @@ namespace BlackMisc
             return copy;
         }
 
-        /*
-         * Divide operator /=
-         */
         template <class MU, class PQ> CPhysicalQuantity<MU, PQ> &CPhysicalQuantity<MU, PQ>::operator /=(double divisor)
         {
             this->m_value /= divisor;
             return *this;
         }
 
-        /*
-         * Divide operator /
-         */
         template <class MU, class PQ> PQ CPhysicalQuantity<MU, PQ>::operator /(double divisor) const
         {
             PQ copy = *derived();
@@ -160,9 +113,6 @@ namespace BlackMisc
             return copy;
         }
 
-        /*
-         * Less operator <
-         */
         template <class MU, class PQ> bool CPhysicalQuantity<MU, PQ>::operator <(const CPhysicalQuantity<MU, PQ> &other) const
         {
             if (*this == other) return false;
@@ -171,35 +121,23 @@ namespace BlackMisc
             return (this->m_value < other.value(this->m_unit));
         }
 
-        /*
-         * Greater than
-         */
         template <class MU, class PQ> bool CPhysicalQuantity<MU, PQ>::operator >(const CPhysicalQuantity<MU, PQ> &other) const
         {
             return other < *this;
         }
 
-        /*
-         * Greater / Equal
-         */
         template <class MU, class PQ> bool CPhysicalQuantity<MU, PQ>::operator >=(const CPhysicalQuantity<MU, PQ> &other) const
         {
             if (*this == other) return true;
             return *this > other;
         }
 
-        /*
-         * Less equal
-         */
         template <class MU, class PQ> bool CPhysicalQuantity<MU, PQ>::operator <=(const CPhysicalQuantity<MU, PQ> &other) const
         {
             if (*this == other) return true;
             return *this < other;
         }
 
-        /*
-         * Switch to another unit
-         */
         template <class MU, class PQ> PQ &CPhysicalQuantity<MU, PQ>::switchUnit(const MU &newUnit)
         {
             if (this->m_unit != newUnit)
@@ -210,33 +148,21 @@ namespace BlackMisc
             return *derived();
         }
 
-        /*
-         * Init by double
-         */
         template <class MU, class PQ> void CPhysicalQuantity<MU, PQ>::setValueSameUnit(double baseValue)
         {
             this->m_value = baseValue;
         }
 
-        /*
-         * Value rounded in unit
-         */
         template <class MU, class PQ> QString CPhysicalQuantity<MU, PQ>::valueRoundedWithUnit(const MU &unit, int digits, bool i18n) const
         {
             return unit.makeRoundedQStringWithUnit(this->value(unit), digits, i18n);
         }
 
-        /*
-         * Value rounded in unit
-         */
         template <class MU, class PQ> double CPhysicalQuantity<MU, PQ>::valueRounded(const MU &unit, int digits) const
         {
             return unit.roundValue(this->value(unit), digits);
         }
 
-        /*
-         * Value rounded as integer
-         */
         template <class MU, class PQ> int CPhysicalQuantity<MU, PQ>::valueInteger(const MU &unit) const
         {
             double v = unit.roundValue(this->value(unit), 0);
@@ -248,17 +174,11 @@ namespace BlackMisc
             return this->valueRounded(this->m_unit, digits);
         }
 
-        /*
-         * Value in unit
-         */
         template <class MU, class PQ> double CPhysicalQuantity<MU, PQ>::value(const MU &unit) const
         {
             return unit.convertFrom(this->m_value, this->m_unit);
         }
 
-        /*
-         * Convert to string
-         */
         template <class MU, class PQ> QString CPhysicalQuantity<MU, PQ>::convertToQString(bool i18n) const
         {
             if (this->isNull())
@@ -268,9 +188,6 @@ namespace BlackMisc
             return this->valueRoundedWithUnit(this->getUnit(), -1, i18n);
         }
 
-        /*
-         * Hash
-         */
         template <class MU, class PQ> uint CPhysicalQuantity<MU, PQ>::getValueHash() const
         {
             QList<uint> hashs;
@@ -280,9 +197,6 @@ namespace BlackMisc
             return BlackMisc::calculateHash(hashs, "PQ");
         }
 
-        /*
-         * JSON Object
-         */
         template <class MU, class PQ> QJsonObject CPhysicalQuantity<MU, PQ>::toJson() const
         {
             QJsonObject json;
@@ -291,9 +205,6 @@ namespace BlackMisc
             return json;
         }
 
-        /*
-         * JSON Object
-         */
         template <class MU, class PQ> void CPhysicalQuantity<MU, PQ>::convertFromJson(const QJsonObject &json)
         {
             const QString unitSymbol = json.value("unit").toString();
@@ -301,9 +212,6 @@ namespace BlackMisc
             this->m_value = json.value("value").toDouble();
         }
 
-        /*
-         * Property
-         */
         template <class MU, class PQ> CVariant CPhysicalQuantity<MU, PQ>::propertyByIndex(const CPropertyIndex &index) const
         {
             if (index.isMyself()) { return this->toCVariant(); }
@@ -329,9 +237,6 @@ namespace BlackMisc
             }
         }
 
-        /*
-         * Property
-         */
         template <class MU, class PQ> void CPhysicalQuantity<MU, PQ>::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
         {
             if (index.isMyself())
@@ -361,9 +266,6 @@ namespace BlackMisc
             }
         }
 
-        /*
-         * Compare
-         */
         template <class MU, class PQ> int CPhysicalQuantity<MU, PQ>::compareImpl(const PQ &a, const PQ &b)
         {
             if (a.isNull() > b.isNull()) { return -1; }
diff --git a/src/blackmisc/pqphysicalquantity.h b/src/blackmisc/pq/physicalquantity.h
similarity index 98%
rename from src/blackmisc/pqphysicalquantity.h
rename to src/blackmisc/pq/physicalquantity.h
index 162307c1a..210cfa5e3 100644
--- a/src/blackmisc/pqphysicalquantity.h
+++ b/src/blackmisc/pq/physicalquantity.h
@@ -9,14 +9,14 @@
 
 //! \file
 
-#ifndef BLACKMISC_PQPHYSICALQUANTITY_H
-#define BLACKMISC_PQPHYSICALQUANTITY_H
+#ifndef BLACKMISC_PQ_PHYSICALQUANTITY_H
+#define BLACKMISC_PQ_PHYSICALQUANTITY_H
 
-#include "blackmisc/pqbase.h"
-#include "blackmisc/pqunits.h"
+#include "blackmisc/pq/measurementunit.h"
+#include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/math/mathutils.h"
-#include "blackmisc/pqstring.h"
+#include "blackmisc/pq/pqstring.h"
 #include "blackmisc/blackmiscfreefunctions.h"
 #include <QtDBus/QDBusMetaType>
 #include <QtGlobal>
diff --git a/src/blackmisc/pq/pq.h b/src/blackmisc/pq/pq.h
new file mode 100644
index 000000000..3501e0ce4
--- /dev/null
+++ b/src/blackmisc/pq/pq.h
@@ -0,0 +1,34 @@
+/* Copyright (C) 2013
+ * swift project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+#ifndef BLACKMISC_PQ_PQ_H
+#define BLACKMISC_PQ_PQ_H
+
+/*!
+ * \namespace BlackMisc::PhysicalQuantities
+ * \brief Classes for physical quantities and units such as length, mass, speed.
+ */
+
+// All units / quantities, required for the instantiations of the template
+// especially as CRTP (Curiously recurring template pattern) is used.
+// http://www.parashift.com/c++-faq-lite/separate-template-fn-defn-from-decl.html
+// http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern
+
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/pressure.h"
+#include "blackmisc/pq/mass.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/temperature.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/pq/acceleration.h"
+#include "blackmisc/pq/pqstring.h"
+
+#endif // guard
diff --git a/src/blackmisc/pqstring.cpp b/src/blackmisc/pq/pqstring.cpp
similarity index 96%
rename from src/blackmisc/pqstring.cpp
rename to src/blackmisc/pq/pqstring.cpp
index ff944498a..ae36d7865 100644
--- a/src/blackmisc/pqstring.cpp
+++ b/src/blackmisc/pq/pqstring.cpp
@@ -7,26 +7,21 @@
  * contained in the LICENSE file.
  */
 
-#include "pqstring.h"
-#include "tuple.h"
-#include "pqallquantities.h"
+#include "blackmisc/pq/pqstring.h"
+#include "blackmisc/tuple.h"
+#include "blackmisc/pq/pq.h"
 #include <QThreadStorage>
 
 namespace BlackMisc
 {
     namespace PhysicalQuantities
     {
-        /*
-         * Convert to string
-         */
+
         QString CPqString::convertToQString(bool /** i18n **/) const
         {
             return this->m_string;
         }
 
-        /*
-         * Parse
-         */
         CVariant CPqString::parseToVariant(const QString &value, SeparatorMode mode)
         {
             CVariant v;
diff --git a/src/blackmisc/pqstring.h b/src/blackmisc/pq/pqstring.h
similarity index 97%
rename from src/blackmisc/pqstring.h
rename to src/blackmisc/pq/pqstring.h
index b5be98c39..96e981703 100644
--- a/src/blackmisc/pqstring.h
+++ b/src/blackmisc/pq/pqstring.h
@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKMISC_PQSTRING_H
-#define BLACKMISC_PQSTRING_H
+#ifndef BLACKMISC_PQ_PQSTRING_H
+#define BLACKMISC_PQ_PQSTRING_H
 
 #include "blackmisc/valueobject.h"
 #include "blackmisc/blackmiscfreefunctions.h"
diff --git a/src/blackmisc/pqpressure.h b/src/blackmisc/pq/pressure.h
similarity index 91%
rename from src/blackmisc/pqpressure.h
rename to src/blackmisc/pq/pressure.h
index ff8dfcf91..c22a441ce 100644
--- a/src/blackmisc/pqpressure.h
+++ b/src/blackmisc/pq/pressure.h
@@ -9,10 +9,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_PQPRESSURE_H
-#define BLACKMISC_PQPRESSURE_H
+#ifndef BLACKMISC_PQ_PRESSURE_H
+#define BLACKMISC_PQ_PRESSURE_H
 
-#include "pqphysicalquantity.h"
+#include "blackmisc/pq/physicalquantity.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/pqspeed.h b/src/blackmisc/pq/speed.h
similarity index 92%
rename from src/blackmisc/pqspeed.h
rename to src/blackmisc/pq/speed.h
index f31a050fc..2e4799912 100644
--- a/src/blackmisc/pqspeed.h
+++ b/src/blackmisc/pq/speed.h
@@ -9,10 +9,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_CSPEED_H
-#define BLACKMISC_CSPEED_H
+#ifndef BLACKMISC_PQ_SPEED_H
+#define BLACKMISC_PQ_SPEED_H
 
-#include "pqphysicalquantity.h"
+#include "blackmisc/pq/physicalquantity.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/pqtemperature.h b/src/blackmisc/pq/temperature.h
similarity index 91%
rename from src/blackmisc/pqtemperature.h
rename to src/blackmisc/pq/temperature.h
index 9c16dd8a0..efcfef932 100644
--- a/src/blackmisc/pqtemperature.h
+++ b/src/blackmisc/pq/temperature.h
@@ -9,10 +9,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_CTEMPERATURE_H
-#define BLACKMISC_CTEMPERATURE_H
+#ifndef BLACKMISC_PQ_TEMPERATURE_H
+#define BLACKMISC_PQ_TEMPERATURE_H
 
-#include "pqphysicalquantity.h"
+#include "blackmisc/pq/physicalquantity.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/pqtime.cpp b/src/blackmisc/pq/time.cpp
similarity index 99%
rename from src/blackmisc/pqtime.cpp
rename to src/blackmisc/pq/time.cpp
index 12a65ec87..030bf5ca6 100644
--- a/src/blackmisc/pqtime.cpp
+++ b/src/blackmisc/pq/time.cpp
@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "pqtime.h"
+#include "blackmisc/pq/time.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/pqtime.h b/src/blackmisc/pq/time.h
similarity index 95%
rename from src/blackmisc/pqtime.h
rename to src/blackmisc/pq/time.h
index e3f176919..a58a896db 100644
--- a/src/blackmisc/pqtime.h
+++ b/src/blackmisc/pq/time.h
@@ -9,10 +9,10 @@
 
 //! \file
 
-#ifndef BLACKMISC_PQTIME_H
-#define BLACKMISC_PQTIME_H
+#ifndef BLACKMISC_PQ_TIME_H
+#define BLACKMISC_PQ_TIME_H
 
-#include "pqphysicalquantity.h"
+#include "blackmisc/pq/physicalquantity.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/pqunits.cpp b/src/blackmisc/pq/units.cpp
similarity index 96%
rename from src/blackmisc/pqunits.cpp
rename to src/blackmisc/pq/units.cpp
index c2f0d88ed..30a172bba 100644
--- a/src/blackmisc/pqunits.cpp
+++ b/src/blackmisc/pq/units.cpp
@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "blackmisc/pqunits.h"
+#include "blackmisc/pq/units.h"
 
 namespace BlackMisc
 {
@@ -15,9 +15,6 @@ namespace BlackMisc
     {
         using BlackMisc::Math::CMathUtils;
 
-        /*
-         * Rounded to QString
-         */
         QString CAngleUnit::makeRoundedQStringWithUnit(double value, int digits, bool i18n) const
         {
             if (digits < 0) digits = this->getDisplayDigits();
@@ -50,9 +47,6 @@ namespace BlackMisc
             return s;
         }
 
-        /*
-         * Rounded to QString
-         */
         QString CTimeUnit::makeRoundedQStringWithUnit(double value, int digits, bool i18n) const
         {
             if (digits < 0) digits = this->getDisplayDigits();
diff --git a/src/blackmisc/pqunits.h b/src/blackmisc/pq/units.h
similarity index 98%
rename from src/blackmisc/pqunits.h
rename to src/blackmisc/pq/units.h
index 574b643fd..ed8568ba0 100644
--- a/src/blackmisc/pqunits.h
+++ b/src/blackmisc/pq/units.h
@@ -1,21 +1,21 @@
 /* Copyright (C) 2013
-//! swift project Community / Contributors
+ * swift project Community / Contributors
  *
-//! This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
-//! directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
-//! including this file, may be copied, modified, propagated, or distributed except according to the terms
-//! contained in the LICENSE file.
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
  */
 
 //! \file
 
-#ifndef BLACKMISC_PQUNITS_H
-#define BLACKMISC_PQUNITS_H
+#ifndef BLACKMISC_PQ_UNITS_H
+#define BLACKMISC_PQ_UNITS_H
 
 #pragma push_macro("min")
 #undef min
 
-#include "blackmisc/pqbase.h"
+#include "blackmisc/pq/measurementunit.h"
 #include "blackmisc/blackmiscfreefunctions.h"
 #include <QtDBus/QDBusArgument>
 #include <QList>
diff --git a/src/blackmisc/pqallquantities.h b/src/blackmisc/pqallquantities.h
deleted file mode 100644
index bfd8af120..000000000
--- a/src/blackmisc/pqallquantities.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Copyright (C) 2013 VATSIM Community / contributors
- *  This Source Code Form is subject to the terms of the Mozilla Public
- *  License, v. 2.0. If a copy of the MPL was not distributed with this
- *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef BLACKMISC_PQUNITSALL_H
-#define BLACKMISC_PQUNITSALL_H
-
-// All units / quantities, required for the instantiations of the template
-// especially as CRTP (Curiously recurring template pattern) is used.
-// http://www.parashift.com/c++-faq-lite/separate-template-fn-defn-from-decl.html
-// http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern
-
-#include "blackmisc/pqlength.h"
-#include "blackmisc/pqfrequency.h"
-#include "blackmisc/pqpressure.h"
-#include "blackmisc/pqmass.h"
-#include "blackmisc/pqspeed.h"
-#include "blackmisc/pqtemperature.h"
-#include "blackmisc/pqangle.h"
-#include "blackmisc/pqtime.h"
-#include "blackmisc/pqacceleration.h"
-#include "blackmisc/pqunits.h"
-#include "blackmisc/pqstring.h"
-
-#endif // guard
diff --git a/src/blackmisc/simplecommandparser.cpp b/src/blackmisc/simplecommandparser.cpp
index 738027695..a653c5701 100644
--- a/src/blackmisc/simplecommandparser.cpp
+++ b/src/blackmisc/simplecommandparser.cpp
@@ -8,7 +8,7 @@
  */
 
 #include "simplecommandparser.h"
-#include "pqstring.h"
+#include "blackmisc/pq/pqstring.h"
 
 using namespace BlackMisc::PhysicalQuantities;
 
diff --git a/src/blackmisc/simulation/fscommon/bcdconversions.h b/src/blackmisc/simulation/fscommon/bcdconversions.h
index fd6680bc0..d8c304244 100644
--- a/src/blackmisc/simulation/fscommon/bcdconversions.h
+++ b/src/blackmisc/simulation/fscommon/bcdconversions.h
@@ -12,7 +12,7 @@
 #ifndef BLACKMISC_SIMULATION_FSCOMMON_BCDCONVERSIONS_H
 #define BLACKMISC_SIMULATION_FSCOMMON_BCDCONVERSIONS_H
 
-#include "blackmisc/pqfrequency.h"
+#include "blackmisc/pq/frequency.h"
 #include "blackmisc/aviation/transponder.h"
 #include <QtGlobal>
 
diff --git a/src/blackmisc/simulation/setsimulator.h b/src/blackmisc/simulation/setsimulator.h
index 5d7f4af3d..3989816e6 100644
--- a/src/blackmisc/simulation/setsimulator.h
+++ b/src/blackmisc/simulation/setsimulator.h
@@ -15,7 +15,7 @@
 #include "blackmisc/valueobject.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/settingutilities.h"
-#include "blackmisc/pqtime.h"
+#include "blackmisc/pq/time.h"
 #include "simulatorplugininfo.h"
 
 namespace BlackMisc
diff --git a/src/blacksound/soundgenerator.h b/src/blacksound/soundgenerator.h
index 43eef4de4..9637bfdcf 100644
--- a/src/blacksound/soundgenerator.h
+++ b/src/blacksound/soundgenerator.h
@@ -14,7 +14,7 @@
 
 #include "blackmisc/aviation/selcal.h"
 #include "blackmisc/audio/audiodeviceinfo.h"
-#include "blackmisc/pqtime.h"
+#include "blackmisc/pq/time.h"
 #include "blackmisc/notificationsounds.h"
 #include <QIODevice>
 #include <QThread>
diff --git a/src/plugins/simulator/fs9/fs9_client.h b/src/plugins/simulator/fs9/fs9_client.h
index f1b59ed12..087f457e7 100644
--- a/src/plugins/simulator/fs9/fs9_client.h
+++ b/src/plugins/simulator/fs9/fs9_client.h
@@ -13,7 +13,7 @@
 #include "directplay_peer.h"
 #include "blackcore/interpolator.h"
 #include "blackmisc/aviation/aircraftsituation.h"
-#include "blackmisc/pqtime.h"
+#include "blackmisc/pq/time.h"
 #include <QMutex>
 #include <QScopedPointer>
 
diff --git a/src/swiftcore/tool.cpp b/src/swiftcore/tool.cpp
index 5ee0f141f..87d2e2f8f 100644
--- a/src/swiftcore/tool.cpp
+++ b/src/swiftcore/tool.cpp
@@ -2,7 +2,7 @@
 #include "blackcore/context_all_interfaces.h"
 #include "blackmisc/propertyindexallclasses.h"
 #include "blackmisc/aviation/aviation.h"
-#include "blackmisc/pqallquantities.h"
+#include "blackmisc/pq/pq.h"
 #include "blackmisc/loghandler.h"
 #include "blackmisc/worker.h"
 #include "blacksound/soundgenerator.h"
diff --git a/tests/blackmisc/testaviation.cpp b/tests/blackmisc/testaviation.cpp
index 7350c5ec8..c359a2161 100644
--- a/tests/blackmisc/testaviation.cpp
+++ b/tests/blackmisc/testaviation.cpp
@@ -4,7 +4,7 @@
  *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "testaviation.h"
-#include "blackmisc/pqconstants.h"
+#include "blackmisc/pq/constants.h"
 #include "blackmisc/aviation/heading.h"
 #include "blackmisc/aviation/informationmessage.h"
 #include "blackmisc/aviation/aircraftsituation.h"
diff --git a/tests/blackmisc/testphysicalquantities.h b/tests/blackmisc/testphysicalquantities.h
index 19abe604f..b8c527a90 100644
--- a/tests/blackmisc/testphysicalquantities.h
+++ b/tests/blackmisc/testphysicalquantities.h
@@ -7,7 +7,7 @@
 #define BLACKMISCTEST_TESTPHYSICALQUANTITIESBASE_H
 
 #include <QtTest/QtTest>
-#include "blackmisc/pqconstants.h"
+#include "blackmisc/pq/constants.h"
 
 namespace BlackMiscTest
 {
diff --git a/tests/blackmisc/testvariantandmap.h b/tests/blackmisc/testvariantandmap.h
index bc9aa632d..574673cf6 100644
--- a/tests/blackmisc/testvariantandmap.h
+++ b/tests/blackmisc/testvariantandmap.h
@@ -6,7 +6,7 @@
 #ifndef BLACKMISCTEST_TESTVARIANTANDMAP_H
 #define BLACKMISCTEST_TESTVARIANTANDMAP_H
 
-#include "blackmisc/pqconstants.h"
+#include "blackmisc/pq/constants.h"
 #include "blackmisc/aviation/atcstation.h"
 #include <QtTest/QtTest>