diff --git a/Makefile b/Makefile
index a18acba9..1dd0752d 100644
--- a/Makefile
+++ b/Makefile
@@ -78,11 +78,11 @@ full-release:
 	make bump
 	git push
 
-requirements.lobster: language-reference-manual/lobster-trlc.conf \
+requirements.lobster: language-reference-manual/lobster-trlc.yaml \
                       language-reference-manual/lrm.rsl \
                       language-reference-manual/lrm.trlc
 	lobster-trlc \
-		--config-file=language-reference-manual/lobster-trlc.conf \
+		--config=language-reference-manual/lobster-trlc.yaml \
 		--out requirements.lobster \
 		language-reference-manual
 
@@ -101,11 +101,11 @@ report.lobster: lobster.conf \
                 requirements.lobster \
                 code.lobster \
                 system-tests.lobster \
-		unit-tests.lobster
+                unit-tests.lobster
 	lobster-report \
 		--lobster-config=lobster.conf \
 		--out=report.lobster
-	lobster-online-report report.lobster
+	lobster-online-report --config=online_report_config.yaml --out=report.lobster
 
 tracing: report.lobster
 	mkdir -p docs
diff --git a/language-reference-manual/lobster-trlc.conf b/language-reference-manual/lobster-trlc.conf
deleted file mode 100644
index 67cefe79..00000000
--- a/language-reference-manual/lobster-trlc.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-LRM.Text {
-  description = text
-  description = bullets
-  just_down = untraced_reason
-}
-
-LRM.Grammar {
-  description = bnf
-}
diff --git a/language-reference-manual/lobster-trlc.yaml b/language-reference-manual/lobster-trlc.yaml
new file mode 100644
index 00000000..b319b7c9
--- /dev/null
+++ b/language-reference-manual/lobster-trlc.yaml
@@ -0,0 +1,14 @@
+conversion-rules:
+  - package: LRM
+    record-type: Text
+    namespace: req
+    description-fields:
+      - text
+      - bullets
+    justification-down-fields:
+      - untraced_reason
+
+  - package: LRM
+    record-type: Grammar
+    namespace: req
+    description-fields: bnf
diff --git a/lobster-trlc-system-test.py b/lobster-trlc-system-test.py
index c5643969..878c2685 100755
--- a/lobster-trlc-system-test.py
+++ b/lobster-trlc-system-test.py
@@ -23,9 +23,9 @@
 import os
 import sys
 
-from lobster.items import Tracing_Tag, Activity
-from lobster.location import File_Reference
-from lobster.io import lobster_write
+from lobster.common.items import Tracing_Tag, Activity
+from lobster.common.location import File_Reference
+from lobster.common.io import lobster_write
 
 from trlc.trlc import Source_Manager
 from trlc.errors import Message_Handler
diff --git a/online_report_config.yaml b/online_report_config.yaml
new file mode 100644
index 00000000..646fd6e4
--- /dev/null
+++ b/online_report_config.yaml
@@ -0,0 +1,4 @@
+report: report.lobster
+commit_id: 'main'
+repo_root: ''
+base_url: 'https://github.com/bmw-software-engineering/trlc'