diff --git a/HYthesisML.cls b/HYthesisML.cls
index 69362912c1c84a3d8bab85e2391c03a33b678bb0..f4d4f6e24de5a3c10c68e933bd11dfd2046dc294 100644
--- a/HYthesisML.cls
+++ b/HYthesisML.cls
@@ -651,7 +651,7 @@
 \onehalfspacing
 
 \begin{center}
-\includegraphics[width=5cm]{HY-logo-ml.png}
+\includegraphics[width=5cm]{template/figures/HY-logo-ml.png}
 
 %\makeatletter
 \begin{large}
diff --git a/bsc-instructions.md b/instructions/bsc-instructions.md
similarity index 100%
rename from bsc-instructions.md
rename to instructions/bsc-instructions.md
diff --git a/msc_english_contents.tex b/msc_english_contents.tex
index 186e99b59868c7e4c9c0640aff443b91bc4b6681..fd994f39cbc3096020ba2945414b6798dcd97178 100644
--- a/msc_english_contents.tex
+++ b/msc_english_contents.tex
@@ -17,7 +17,7 @@ Remember always to cite the figure in the main text. In addition, consider provi
 
 \begin{figure}[h!] 
 \begin{center}
-\includegraphics[width=0.3\textwidth]{HY-logo-ml.png}
+\includegraphics[width=0.3\textwidth]{template/figures/HY-logo-ml.png}
 \caption{University of Helsinki flame-logo for Faculty of Science.\label{fig:logo}}
 \end{center}
 \end{figure}
diff --git a/msc_finnish_contents.tex b/msc_finnish_contents.tex
index b84533c0ea831858c49448f22fedd4eaafa966b5..570be95935e76c33016ac65351f695ea3876526d 100644
--- a/msc_finnish_contents.tex
+++ b/msc_finnish_contents.tex
@@ -10,7 +10,7 @@ Kuva~\ref{fig:logo} toimii esimerkkinä kuvan lisäämisestä työhön. Muista m
 
 \begin{figure}[h!] % remove [h!] for automatic placement, which is probalby better for a thesis with more text on page
 \centering 
-\includegraphics[width=0.3\textwidth]{HY-logo-ml.png}
+\includegraphics[width=0.3\textwidth]{template/figures/HY-logo-ml.png}
 \caption{Helsingin yliopiston logo matemaattis-luonnontieteellisen tiedekunnan värein.\label{fig:logo}}
 \end{figure}
 
diff --git a/HY-logo-ml.png b/template/figures/HY-logo-ml.png
similarity index 100%
rename from HY-logo-ml.png
rename to template/figures/HY-logo-ml.png
diff --git a/auxiliary/translator-UHCSthesis-coverpage-dictionary-English.dict b/template/translator-UHCSthesis-coverpage-dictionary-English.dict
similarity index 100%
rename from auxiliary/translator-UHCSthesis-coverpage-dictionary-English.dict
rename to template/translator-UHCSthesis-coverpage-dictionary-English.dict
diff --git a/auxiliary/translator-UHCSthesis-coverpage-dictionary-Finnish.dict b/template/translator-UHCSthesis-coverpage-dictionary-Finnish.dict
similarity index 100%
rename from auxiliary/translator-UHCSthesis-coverpage-dictionary-Finnish.dict
rename to template/translator-UHCSthesis-coverpage-dictionary-Finnish.dict
diff --git a/auxiliary/translator-UHCSthesis-coverpage-dictionary-Swedish.dict b/template/translator-UHCSthesis-coverpage-dictionary-Swedish.dict
similarity index 100%
rename from auxiliary/translator-UHCSthesis-coverpage-dictionary-Swedish.dict
rename to template/translator-UHCSthesis-coverpage-dictionary-Swedish.dict