diff --git a/Makefile b/Makefile
index aa43ca0..1e7bc1c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,20 @@
 BASENAME=scientificcomputing-script
 
+SUBDIRS=programming statistics bootstrap likelihood pointprocesses spike_trains designpattern
+# regression
+
 pdf : $(BASENAME).pdf
+	for sd in $(SUBDIRS); do $(MAKE) -C $$sd/lecture pdf; done
 
 $(BASENAME).pdf : $(BASENAME).tex header.tex
 	export TEXMFOUTPUT=.; pdflatex -interaction=scrollmode $< | tee /dev/stderr | fgrep -q "Rerun to get cross-references right" && pdflatex -interaction=scrollmode $< || true
 
 clean :
 	rm -f *~  $(BASENAME).aux $(BASENAME).log $(BASENAME).out $(BASENAME).toc
+	for sd in $(SUBDIRS); do $(MAKE) -C $$sd/lecture clean; done
 
 cleanall : clean
 	rm -f $(PDFFILE)
 
 watch :
 	while true; do ! make -q pdf && make pdf; sleep 0.5; done
-
-
diff --git a/regression/lecture/Makefile b/regression/lecture/Makefile
index 4486638..71741c9 100644
--- a/regression/lecture/Makefile
+++ b/regression/lecture/Makefile
@@ -1,10 +1,10 @@
-BASENAME=linear_regression
+BASENAME=regression
 PYFILES=$(wildcard *.py)
 PYPDFFILES=$(PYFILES:.py=.pdf)
 
 pdf : $(BASENAME).pdf $(PYPDFFILES)
 
-$(BASENAME).pdf : $(BASENAME).tex
+$(BASENAME).pdf : $(BASENAME)-chapter.tex
 	pdflatex -interaction=scrollmode $< | tee /dev/stderr | fgrep -q "Rerun to get cross-references right" && pdflatex -interaction=scrollmode $< || true
 
 $(PYPDFFILES) : %.pdf : %.py
diff --git a/regression/lecture/linear_regression.tex b/regression/lecture/linear_regression.tex
deleted file mode 100644
index 46e3b95..0000000
--- a/regression/lecture/linear_regression.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-\chapter{\tr{Optimization and Gradient Descent}{Parameteroptimierung und Gradientenabstiegsverfahren}}
-
-
diff --git a/regression/lecture/regression-chapter.tex b/regression/lecture/regression-chapter.tex
new file mode 100644
index 0000000..8cbba06
--- /dev/null
+++ b/regression/lecture/regression-chapter.tex
@@ -0,0 +1,16 @@
+\documentclass[12pt]{report}
+
+\input{../../header}
+
+\lstset{inputpath=../code}
+
+\graphicspath{{figures/}}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\begin{document} 
+
+\include{regression}
+
+\end{document}
diff --git a/regression/lecture/linear_regression-slides.tex b/regression/lecture/regression-slides.tex
similarity index 100%
rename from regression/lecture/linear_regression-slides.tex
rename to regression/lecture/regression-slides.tex
diff --git a/regression/lecture/regression.tex b/regression/lecture/regression.tex
new file mode 100644
index 0000000..a0beed2
--- /dev/null
+++ b/regression/lecture/regression.tex
@@ -0,0 +1,3 @@
+\chapter{\tr{Optimization and Gradient Descent}{Optimierung und Gradientenabstiegsverfahren}}
+
+
diff --git a/scientificcomputing-script.tex b/scientificcomputing-script.tex
index 89af384..891303c 100644
--- a/scientificcomputing-script.tex
+++ b/scientificcomputing-script.tex
@@ -4,9 +4,6 @@
 
 \setcounter{maxexercise}{10000}  % show listings up to exercise maxexercise
 
-\graphicspath{{statistics/lecture/}{statistics/lecture/figures/}{bootstrap/lecture/}{bootstrap/lecture/figures/}{likelihood/lecture/}{likelihood/lecture/figures/}{pointprocesses/lecture/}{pointprocesses/lecture/figures/}{programming/lectures/images/}{spike_trains/lecture/images/}}
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{document} 
@@ -15,28 +12,36 @@
 
 \tableofcontents
 
+\graphicspath{{programming/lectures/}{programming/lectures/images/}}
 \lstset{inputpath=programming/code}
 \include{programming/lectures/programming}
 
+\graphicspath{{statistics/lecture/}{statistics/lecture/figures/}}
 \lstset{inputpath=statistics/code}
 \include{statistics/lecture/statistics}
 
+\graphicspath{{bootstrap/lecture/}{bootstrap/lecture/figures/}}
 \lstset{inputpath=bootstrap/code}
 \include{bootstrap/lecture/bootstrap}
 
+\graphicspath{{regression/lecture/}{regression/lecture/figures/}}
 \lstset{inputpath=regression/code}
-\include{regression/lecture/linear_regression}
+%\include{regression/lecture/linear_regression}
 
+\graphicspath{{likelihood/lecture/}{likelihood/lecture/figures/}}
 \lstset{inputpath=likelihood/code}
 \include{likelihood/lecture/likelihood}
 
+\graphicspath{{pointprocesses/lecture/}{pointprocesses/lecture/figures/}}
 \lstset{inputpath=pointprocesses/code/}
 \renewcommand{\texinputpath}{pointprocesses/lecture/}
 \include{pointprocesses/lecture/pointprocesses}
 
+\graphicspath{{spike_trains/lecture/images/}}
 \lstset{inputpath=spike_trains/code/}
 \include{spike_trains/lecture/psth_sta}
 
+\graphicspath{{designpattern/lecture}{designpattern/lecture/figures}}
 \lstset{inputpath=designpattern/code/}
 \include{designpattern/lecture/designpattern}
 
diff --git a/spike_trains/lecture/psth_sta-chapter.tex b/spike_trains/lecture/psth_sta-chapter.tex
index 54499f1..323d374 100644
--- a/spike_trains/lecture/psth_sta-chapter.tex
+++ b/spike_trains/lecture/psth_sta-chapter.tex
@@ -4,7 +4,7 @@
 
 \lstset{inputpath=../code}
 
-\graphicspath{{figures/}}
+\graphicspath{{images/}}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/spike_trains/lecture/psth_sta.tex b/spike_trains/lecture/psth_sta.tex
index 73d8fe1..59f4b6c 100644
--- a/spike_trains/lecture/psth_sta.tex
+++ b/spike_trains/lecture/psth_sta.tex
@@ -31,7 +31,7 @@ Methoden diese zu bestimmen. Drei solcher Methoden sind in Abbildung
 \ref{psthfig} dargestellt.
 
 \begin{figure}
-  \includegraphics[width=\columnwidth]{images/psth_comparison}
+  \includegraphics[width=\columnwidth]{psth_comparison}
   \caption{\textbf{Verschiedene Methoden das PSTH zu bestimmen. A)}
     Rasterplot einer einzelnen neuronalen Antwort. Jeder vertikale
     Strich notiert den Zeitpunkt eines Aktionspotentials. \textbf{B)}
@@ -101,7 +101,7 @@ ausgeschnitten wird und diese dann mittelt (Abbildung
 \ref{stafig}). 
 
 \begin{figure}
-  \includegraphics[width=0.5\columnwidth]{images/sta}
+  \includegraphics[width=0.5\columnwidth]{sta}
   \caption{\textbf{Spike Triggered Average eines P-Typ
       Elektrorezeptors.} Der Rezeptor wurde mit einem ``white-noise''
     Stimulus getrieben. Zeitpunkt 0 ist der Zeitpunkt des beobachteten
@@ -126,7 +126,7 @@ Stimulus zu rekonstruieren (Abbildung
   Rekonstruktion} wird die Zellantwort mit dem STA gefaltet.
 
 \begin{figure}
-  \includegraphics[width=\columnwidth]{images/reconstruction}
+  \includegraphics[width=\columnwidth]{reconstruction}
   \caption{\textbf{Rekonstruktion des Stimulus mittels STA.} Die
     Zellantwort wird mit dem STA gefaltet um eine Rekonstruktion des
     Stimulus zu erhalten.}\label{reverse_reconstruct_fig}