diff --git a/lang-input.sty b/lang-input.sty
new file mode 100644
index 0000000..4ee0ff6
--- /dev/null
+++ b/lang-input.sty
@@ -0,0 +1,12 @@
+% Input / encoding
+\RequirePackage[\ifutf utf8\else utf8x\fi]{inputenc}
+\RequirePackage[T1]{fontenc}
+
+% Font
+\RequirePackage{lmodern} % Use latin modern font
+\RequirePackage{anyfontsize} % Provides \fontsize{...}{...}\selectfont
+\RequirePackage{soul} % Hyphenation, crossing \ldots
+
+% Language support
+\RequirePackage[\ifenglish english \else ngerman\fi]{babel}
+
diff --git a/mkessler-math.sty b/mkessler-math.sty
index 9101e35..49170fd 100644
--- a/mkessler-math.sty
+++ b/mkessler-math.sty
@@ -15,14 +15,6 @@
 \DeclareOption*{\PackageWarning{mkessler-math}{Unknown '\CurrentOption'}}
 \ProcessOptions\relax
 
-
-\RequirePackage[\ifenglish english \else ngerman\fi]{babel}
-\RequirePackage[T1]{fontenc}
-
-% When using utf8x, we have to load ucs and inputenc with utf8x option and must exclude bibtex
-% When not using utf8x (plan utf8), we must NOT load ucs, and then load inputenc with utf8-option as well as bibtex
-% also, when using plain utf8, we want to load the newunicodechar package
-\RequirePackage[utf8]{inputenc}
 \RequirePackage{newunicodechar}
     \newunicodechar{α}{\ensuremath\alpha}
     \newunicodechar{β}{\ensuremath\beta}
@@ -48,43 +40,33 @@
     \newunicodechar{ψ}{\ensuremath\psi}
     \newunicodechar{ω}{\ensuremath\omega}
 
-\RequirePackage[backend=biber,style=alphabetic]{biblatex}
-\RequirePackage{csquotes}
-
-\RequirePackage{anyfontsize}
-\RequirePackage{lmodern}
 \RequirePackage{etoolbox}
 \RequirePackage{amsmath}
 \RequirePackage{mathtools}
 \RequirePackage{amsthm}
 \RequirePackage{amssymb}
-\RequirePackage{comment}
-\RequirePackage{soul}
-\RequirePackage{caption}
-\RequirePackage{subcaption}
+
 \RequirePackage{latexsym}
 \RequirePackage{mathrsfs}
 \ifbeamer\else
 \RequirePackage[shortlabels]{enumitem}
 \fi
-\RequirePackage{wrapfig}
 
-%Pgfplots
-\RequirePackage{pgfplots}
+\RequirePackage{pgfplots} % Plots
 \pgfplotsset{compat=1.7}
 
-% TIKZ
-\RequirePackage{tikz}
+\RequirePackage{tikz} % Plots / drawings
 \usetikzlibrary{calc, intersections, through, quotes, angles, babel, positioning, snakes}
-%\RequirePackage{tkz-euclide}
-\RequirePackage[export]{adjustbox}
-%Commutative diagrams
-\RequirePackage{tikz-cd}
+
+\RequirePackage{tikz-cd} %Commutative diagrams
 
 %%for small diagrams, similar to tikz-cd
 \usepackage{xy}        % for small diagrams, e.g. arrows
 \xyoption{all}
 
+
+
+
 %%Theorems needed in any case (fancy or not fancy theorems)
 
 % Für Formeln
diff --git a/removed.sty b/removed.sty
new file mode 100644
index 0000000..1419492
--- /dev/null
+++ b/removed.sty
@@ -0,0 +1,24 @@
+
+
+%%%% Bibliography
+\RequirePackage[backend=biber,style=alphabetic]{biblatex}
+
+% Quotations
+\RequirePackage{csquotes} % quotations
+
+
+%%%% Utilities
+\RequirePackage{comment} %comments
+\RequirePackage{todo} % todo notes
+
+\RequirePackage[export]{adjustbox} % 
+
+%%% Figures
+\RequirePackage{caption} % Caption in minipages
+\RequirePackage{subcaption} % Subfigures / captions
+
+\RequirePackage{wrapfig} % Wrap text around figures
+
+
+% Math-related
+\RequirePackage[export]{adjustbox}