diff --git a/HSRTReport/HSRTReport.cls b/HSRTReport/HSRTReport.cls
index 96d81b3..8e4159a 100644
--- a/HSRTReport/HSRTReport.cls
+++ b/HSRTReport/HSRTReport.cls
@@ -336,3 +336,5 @@
 \input{\classPath/Modules/Watermark}
 \input{\classPath/Modules/ToC}
 \input{\classPath/Modules/Typography}
+\input{\classPath/Modules/GlossarySettings}
+\input{\classPath/Modules/WordCount}
diff --git a/TeX/GlossarySettings.tex b/HSRTReport/Modules/GlossarySettings.tex
similarity index 97%
rename from TeX/GlossarySettings.tex
rename to HSRTReport/Modules/GlossarySettings.tex
index ce8ee82..46dd6a8 100644
--- a/TeX/GlossarySettings.tex
+++ b/HSRTReport/Modules/GlossarySettings.tex
@@ -1,4 +1,4 @@
-%!TEX root = ../Main.tex
+%!TEX root = ../../Main.tex
 \makeglossaries
 
 \newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash\hspace{0pt}}p{#1}}
diff --git a/HSRTReport/Modules/WordCount.tex b/HSRTReport/Modules/WordCount.tex
new file mode 100644
index 0000000..79b152f
--- /dev/null
+++ b/HSRTReport/Modules/WordCount.tex
@@ -0,0 +1,13 @@
+% !TEX root = ../../Main.tex
+
+% Source: https://docs.overleaf.com/writing-and-editing/using-word-count
+
+\newcommand{\quickwordcount}[1]{%
+	\immediate\write18{texcount -1 -sum -merge -q #1.tex > Build/words.sum }%
+	\input{Build/words.sum} words%
+}
+
+\newcommand{\detailtexcount}[1]{%
+	\immediate\write18{texcount -merge -sum -q #1.tex > Build/.wcdetail }%
+	\verbatiminput{Build/.wcdetail}%
+}
diff --git a/Main.acn b/Main.acn
new file mode 100644
index 0000000..4708870
--- /dev/null
+++ b/Main.acn
@@ -0,0 +1,4 @@
+\glossaryentry{Abb.?\glossentry{a:Abb}|setentrycounter[]{page}"\glsignore}{10}
+\glossaryentry{MPG?\glossentry{a:MPG}|setentrycounter[]{page}"\glsignore}{10}
+\glossaryentry{MS?\glossentry{a:MS}|setentrycounter[]{page}"\glsignore}{10}
+\glossaryentry{Tab.?\glossentry{a:Tab}|setentrycounter[]{page}"\glsignore}{10}
diff --git a/Main.equ b/Main.equ
new file mode 100644
index 0000000..172de17
--- /dev/null
+++ b/Main.equ
@@ -0,0 +1 @@
+\contentsline {myequations}{\equationname ~\hbox to\@tempdima {1:\hfil } Polstellenberechnung}{9}{equation.25}%
diff --git a/Main.glo b/Main.glo
new file mode 100644
index 0000000..dd1ef54
--- /dev/null
+++ b/Main.glo
@@ -0,0 +1 @@
+\glossaryentry{Textkörper?\glossentry{Textkoerper}|setentrycounter[]{page}"\glsignore}{10}
diff --git a/Main.ist b/Main.ist
new file mode 100644
index 0000000..0fc3e59
--- /dev/null
+++ b/Main.ist
@@ -0,0 +1,29 @@
+% makeindex style file created by the glossaries package
+% for document 'Main' on 2025-10-29
+actual '?'
+encap '|'
+level '!'
+quote '"'
+keyword "\\glossaryentry"
+preamble "\\glossarysection[\\glossarytoctitle]{\\glossarytitle}\\glossarypreamble\n\\begin{theglossary}\\glossaryheader\n"
+postamble "\%\n\\end{theglossary}\\glossarypostamble\n"
+group_skip "\\glsgroupskip\n"
+item_0 "\%\n"
+item_1 "\%\n"
+item_2 "\%\n"
+item_01 "\%\n"
+item_x1 "\\relax \\glsresetentrylist\n"
+item_12 "\%\n"
+item_x2 "\\relax \\glsresetentrylist\n"
+delim_0 "\{\\glossaryentrynumbers\{\\relax "
+delim_1 "\{\\glossaryentrynumbers\{\\relax "
+delim_2 "\{\\glossaryentrynumbers\{\\relax "
+delim_t "\}\}"
+delim_n "\\delimN "
+delim_r "\\delimR "
+headings_flag 1
+heading_prefix "\\glsgroupheading\{"
+heading_suffix "\}\\relax \\glsresetentrylist "
+symhead_positive "glssymbols"
+numhead_positive "glsnumbers"
+page_compositor "."
diff --git a/Main.pdf b/Main.pdf
new file mode 100644
index 0000000..0ac4e89
Binary files /dev/null and b/Main.pdf differ
diff --git a/TeX/Preamble.tex b/TeX/Preamble.tex
index da881bc..329c956 100644
--- a/TeX/Preamble.tex
+++ b/TeX/Preamble.tex
@@ -6,12 +6,7 @@
 \usepackage[nameinlink, noabbrev]{cleveref}
 % ==== /Imports ====
 
-% === Wordcount ===
-\input{TeX/WordCount}
-% === /Wordcount ===
-
 % ==== Glossary and Bib ====
-\input{TeX/GlossarySettings}
 \addbibresource{Main.bib}
 % ==== /Glossary and Bib ====
 
diff --git a/TeX/WordCount.tex b/TeX/WordCount.tex
deleted file mode 100644
index 48c1224..0000000
--- a/TeX/WordCount.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-% !TEX root = ../Main.tex
-
-% Source: https://docs.overleaf.com/writing-and-editing/using-word-count
-
-\newcommand{\quickwordcount}[1]{%
-  \immediate\write18{texcount -1 -sum -merge -q #1.tex > Build/words.sum }%
-  \input{Build/words.sum} words%
-}
-
-\newcommand{\detailtexcount}[1]{%
-  \immediate\write18{texcount -merge -sum -q #1.tex > Build/.wcdetail }%
-  \verbatiminput{Build/.wcdetail}%
-}