diff --git a/classes/MDErrorReporter b/classes/MDErrorReporter
index 7ecd0e4..49669cc 160000
--- a/classes/MDErrorReporter
+++ b/classes/MDErrorReporter
@@ -1 +1 @@
-Subproject commit 7ecd0e4a8d028b142ad9ef04c805ed49278707e3
+Subproject commit 49669ccf9740d391da6d3f2cb7d5348a784c94b6
diff --git a/classes/MD_STD b/classes/MD_STD
index 8aa9d94..2c1f6a0 160000
--- a/classes/MD_STD
+++ b/classes/MD_STD
@@ -1 +1 @@
-Subproject commit 8aa9d94acf2c90956a190c31ad2bba8b3f0024c1
+Subproject commit 2c1f6a0490709d87d509791f5ec81bfb52503880
diff --git a/inc/constants.php b/inc/constants.php
index 53a2b9f..f1d00b9 100644
--- a/inc/constants.php
+++ b/inc/constants.php
@@ -19,7 +19,7 @@ const TL_FILE_DIRS = [
 const AUTOLOAD_DIRS = [
     __DIR__ . "/../classes",
     __DIR__ . "/../classes/MDTlLoader/src",
-    __DIR__ . "/../classes/MD_STD",
+    __DIR__ . "/../classes/MD_STD/src",
     __DIR__ . "/../classes/MDAllowedValueSets/src",
     __DIR__ . "/../classes/MDExportFormats/src",
     __DIR__ . "/../classes/MDErrorReporter",
@@ -34,11 +34,12 @@ const AUTOLOAD_DIRS = [
 const AUTOLOAD_CLASS_MAP = [
     'CsvxmlAvailableFields' => __DIR__ . '/../classes/CsvxmlAvailableFields.php',
     'MDTlLoader' => __DIR__ . '/../classes/MDTlLoader/src/MDTlLoader.php',
-    'MD_JAIL' => __DIR__ . '/../classes/MD_STD/MD_JAIL.php',
-    'MD_STD' => __DIR__ . '/../classes/MD_STD/MD_STD.php',
-    'MD_STD_CACHE' => __DIR__ . '/../classes/MD_STD/MD_STD_CACHE.php',
-    'MD_STD_IN' => __DIR__ . '/../classes/MD_STD/MD_STD_IN.php',
-    'MD_STD_SEC' => __DIR__ . '/../classes/MD_STD/MD_STD_SEC.php',
+    'MDFormatter' => __DIR__ . '/../classes/MD_STD/src/MDFormatter.php',
+    'MD_JAIL' => __DIR__ . '/../classes/MD_STD/src/MD_JAIL.php',
+    'MD_STD' => __DIR__ . '/../classes/MD_STD/src/MD_STD.php',
+    'MD_STD_CACHE' => __DIR__ . '/../classes/MD_STD/src/MD_STD_CACHE.php',
+    'MD_STD_IN' => __DIR__ . '/../classes/MD_STD/src/MD_STD_IN.php',
+    'MD_STD_SEC' => __DIR__ . '/../classes/MD_STD/src/MD_STD_SEC.php',
     'MDAppointmentRecordingSet' => __DIR__ . '/../classes/MDAllowedValueSets/src/MDAppointmentRecordingSet.php',
     'MDConservationReportTypeSet' => __DIR__ . '/../classes/MDAllowedValueSets/src/MDConservationReportTypeSet.php',
     'MDCurrenciesSet' => __DIR__ . '/../classes/MDAllowedValueSets/src/MDCurrenciesSet.php',
diff --git a/l10n/musdb b/l10n/musdb
index bc2bd80..2243608 160000
--- a/l10n/musdb
+++ b/l10n/musdb
@@ -1 +1 @@
-Subproject commit bc2bd801792bd48c1bbcc92e35106534b35c4ab3
+Subproject commit 2243608fec438198d7843a3d1f046b1fd257c5f6