diff --git a/HSRTReport/HSRTReport.cls b/HSRTReport/HSRTReport.cls
index 8e4159a..bb8982e 100644
--- a/HSRTReport/HSRTReport.cls
+++ b/HSRTReport/HSRTReport.cls
@@ -328,13 +328,19 @@
 % ----------------------------------------
 \input{\classPath/Pages/Titlepage.tex}
 
-% ==== Tools ====
-\input{\classPath/Modules/Listings}
-\input{\classPath/Modules/Floats}
-\input{\classPath/Modules/MeetingPresence}
-\input{\classPath/Modules/InfoBlocks}
-\input{\classPath/Modules/Watermark}
-\input{\classPath/Modules/ToC}
-\input{\classPath/Modules/Typography}
-\input{\classPath/Modules/GlossarySettings}
-\input{\classPath/Modules/WordCount}
+% ==== Content Modules ====
+\input{\classPath/Modules/Content/Listings}
+\input{\classPath/Modules/Content/Floats}
+\input{\classPath/Modules/Content/GlossarySettings}
+
+% ==== Layout Modules ====
+\input{\classPath/Modules/Layout/InfoBlocks}
+\input{\classPath/Modules/Layout/Watermark}
+
+% ==== Formatting Modules ====
+\input{\classPath/Modules/Formatting/ToC}
+\input{\classPath/Modules/Formatting/Typography}
+
+% ==== Tool Modules ====
+\input{\classPath/Modules/Tools/MeetingPresence}
+\input{\classPath/Modules/Tools/WordCount}
diff --git a/HSRTReport/Modules/Floats.tex b/HSRTReport/Modules/Content/Floats.tex
similarity index 100%
rename from HSRTReport/Modules/Floats.tex
rename to HSRTReport/Modules/Content/Floats.tex
diff --git a/HSRTReport/Modules/GlossarySettings.tex b/HSRTReport/Modules/Content/GlossarySettings.tex
similarity index 100%
rename from HSRTReport/Modules/GlossarySettings.tex
rename to HSRTReport/Modules/Content/GlossarySettings.tex
diff --git a/HSRTReport/Modules/Listings.tex b/HSRTReport/Modules/Content/Listings.tex
similarity index 100%
rename from HSRTReport/Modules/Listings.tex
rename to HSRTReport/Modules/Content/Listings.tex
diff --git a/HSRTReport/Modules/ToC.tex b/HSRTReport/Modules/Formatting/ToC.tex
similarity index 100%
rename from HSRTReport/Modules/ToC.tex
rename to HSRTReport/Modules/Formatting/ToC.tex
diff --git a/HSRTReport/Modules/Typography.tex b/HSRTReport/Modules/Formatting/Typography.tex
similarity index 100%
rename from HSRTReport/Modules/Typography.tex
rename to HSRTReport/Modules/Formatting/Typography.tex
diff --git a/HSRTReport/Modules/InfoBlocks.tex b/HSRTReport/Modules/Layout/InfoBlocks.tex
similarity index 100%
rename from HSRTReport/Modules/InfoBlocks.tex
rename to HSRTReport/Modules/Layout/InfoBlocks.tex
diff --git a/HSRTReport/Modules/Watermark.tex b/HSRTReport/Modules/Layout/Watermark.tex
similarity index 100%
rename from HSRTReport/Modules/Watermark.tex
rename to HSRTReport/Modules/Layout/Watermark.tex
diff --git a/HSRTReport/Modules/MeetingPresence.tex b/HSRTReport/Modules/Tools/MeetingPresence.tex
similarity index 100%
rename from HSRTReport/Modules/MeetingPresence.tex
rename to HSRTReport/Modules/Tools/MeetingPresence.tex
diff --git a/HSRTReport/Modules/WordCount.tex b/HSRTReport/Modules/Tools/WordCount.tex
similarity index 100%
rename from HSRTReport/Modules/WordCount.tex
rename to HSRTReport/Modules/Tools/WordCount.tex
diff --git a/Main.acr b/Main.acr
new file mode 100644
index 0000000..516dc34
--- /dev/null
+++ b/Main.acr
@@ -0,0 +1,14 @@
+\glossarysection[\glossarytoctitle]{\glossarytitle}\glossarypreamble
+\begin{theglossary}\glossaryheader
+\glsgroupheading{A}\relax \glsresetentrylist %
+\glossentry{a:Abb}{\glossaryentrynumbers{\relax 
+		\setentrycounter[]{page}\glsignore{10}}}\glsgroupskip
+\glsgroupheading{M}\relax \glsresetentrylist %
+\glossentry{a:MPG}{\glossaryentrynumbers{\relax 
+		\setentrycounter[]{page}\glsignore{10}}}%
+\glossentry{a:MS}{\glossaryentrynumbers{\relax 
+		\setentrycounter[]{page}\glsignore{10}}}\glsgroupskip
+\glsgroupheading{T}\relax \glsresetentrylist %
+\glossentry{a:Tab}{\glossaryentrynumbers{\relax 
+		\setentrycounter[]{page}\glsignore{10}}}%
+\end{theglossary}\glossarypostamble
diff --git a/Main.alg b/Main.alg
new file mode 100644
index 0000000..58dc64e
--- /dev/null
+++ b/Main.alg
@@ -0,0 +1,7 @@
+This is makeindex, version 2.17 [TeX Live 2023] (kpathsea + Thai support).
+Scanning style file ./Main.ist...........................done (27 attributes redefined, 0 ignored).
+Scanning input file Main.acn....done (4 entries accepted, 0 rejected).
+Sorting entries....done (9 comparisons).
+Generating output file Main.acr....done (14 lines written, 0 warnings).
+Output written in Main.acr.
+Transcript written in Main.alg.
diff --git a/Main.equ b/Main.equ
index 172de17..5fe57a8 100644
--- a/Main.equ
+++ b/Main.equ
@@ -1 +1 @@
-\contentsline {myequations}{\equationname ~\hbox to\@tempdima {1:\hfil } Polstellenberechnung}{9}{equation.25}%
+\contentsline {myequations}{\equationname ~\hbox to\@tempdima {1:\hfil } Polstellenberechnung}{9}{equation.31}%
diff --git a/Main.glg b/Main.glg
new file mode 100644
index 0000000..e1b4a05
--- /dev/null
+++ b/Main.glg
@@ -0,0 +1,7 @@
+This is makeindex, version 2.17 [TeX Live 2023] (kpathsea + Thai support).
+Scanning style file ./Main.ist...........................done (27 attributes redefined, 0 ignored).
+Scanning input file Main.glo....done (1 entries accepted, 0 rejected).
+Sorting entries...done (0 comparisons).
+Generating output file Main.gls....done (6 lines written, 0 warnings).
+Output written in Main.gls.
+Transcript written in Main.glg.
diff --git a/Main.gls b/Main.gls
new file mode 100644
index 0000000..f6ac28c
--- /dev/null
+++ b/Main.gls
@@ -0,0 +1,6 @@
+\glossarysection[\glossarytoctitle]{\glossarytitle}\glossarypreamble
+\begin{theglossary}\glossaryheader
+\glsgroupheading{T}\relax \glsresetentrylist %
+\glossentry{Textkoerper}{\glossaryentrynumbers{\relax 
+		\setentrycounter[]{page}\glsignore{10}}}%
+\end{theglossary}\glossarypostamble
diff --git a/Main.pdf b/Main.pdf
index 0ac4e89..a07ef48 100644
Binary files a/Main.pdf and b/Main.pdf differ