diff --git a/Makefile b/Makefile
index 90876b253da015fb999f8405e3863a83c655ccb8..50e8d76d0af3d616f030d38a6e365c5e2d25e3d8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ default: $(NAME).pdf
 
 all: $(NAME).pdf
 
-build/%.pdf: %.tex sty/*.sty
+build/%.pdf: %.tex *.sty
 	mkdir -p build
 	latexmk -pdf -g -f -auxdir=build -outdir=build $<
 
@@ -15,7 +15,7 @@ build/%.pdf: %.tex sty/*.sty
 
 .PHONY: show clean distclean
 
-show: $(NAME)_debug.pdf
+show: $(NAME).pdf
 	xdg-open $<
 
 clean:
diff --git a/pflichtenheft.tex b/pflichtenheft.tex
index c61276a5839aec9215f3d7b410893dde73fdfabd..9303caf009bb8380412bf060a5c753992b85f333 100644
--- a/pflichtenheft.tex
+++ b/pflichtenheft.tex
@@ -11,33 +11,48 @@
 \usepackage{csquotes}
 
 % cross referencing
-\usepackage{sty/rdfref-user}
-\usepackage{sty/rdfref-query}
+\usepackage{rdfref-user}
+\usepackage{rdfref-query}
 \newcommand\partOf[1]{\AddProperty{doc:partOf}{#1}}
 \newcommand\tests[1]{\AddProperty{pfl:tests}{#1}}
 
-\newcommand\test[2]{\subsection{#1}\rdflabel{#2}
-	Testing: \Bind{#2}{pfl:tests}{?f}{ \GetVal{?f} }}
-\newcommand\functionality[2]{\subsection{#1}\rdflabel{#2}
-	Tested by: \Bind{?t}{pfl:tests}{#2}{ \GetVal{?t} }}
+\newcounter{functionality}
+\newcounter{test}
+
+% document macros
+\newcommand\test[2]{
+  \stepcounter{test}
+  \par\textbf{T\arabic{test} #1}\rdflabel{#2}
+  \marginpar{T\arabic{test}}
+  Testing: \Bind{#2}{pfl:tests}{?f}{ \GetVal{?f} }
+  \par}
+\newcommand\functionality[2]{
+  \stepcounter{functionality}
+  \par\textbf{F\arabic{functionality} #1}\rdflabel{#2}
+  \marginpar{F\arabic{functionality}}
+  Tested by: \Bind{?t}{pfl:tests}{#2}{ \GetVal{?t} }
+  \par}
 
 \begin{document}
 
-\section{Funktionen}
+\section{Kriterien}
+
 \rdflabel{sec:funktionen}
 
 \subsection{Muss}
 \rdflabel{sec:muss}
 \partOf{sec:funktionen}
 
-\functionality{Foo}{fnc:foo}
-
-\functionality{Bar}{fnc:bar}
-
 \subsection{Kann}
 \rdflabel{sec:kann}
 \partOf{sec:funktionen}
 
+\section{Funktionen}
+
+\functionality{Foo}{fnc:foo}
+
+\functionality{Bar}{fnc:bar}
+
 \section{Tests}
 \rdflabel{sec:tests}
 
diff --git a/sty/rdfref-core.sty b/rdfref-core.sty
similarity index 100%
rename from sty/rdfref-core.sty
rename to rdfref-core.sty
diff --git a/sty/rdfref-query.sty b/rdfref-query.sty
similarity index 98%
rename from sty/rdfref-query.sty
rename to rdfref-query.sty
index be05453f72f1cb6cb451107fa92aa4ab806f8572..98762aeac2d9be525d5d85399ebadf9644437d29 100644
--- a/sty/rdfref-query.sty
+++ b/rdfref-query.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{rdfref-query}
-\RequirePackage{sty/rdfref-core}
+\RequirePackage{rdfref-core}
 \def\Var#1{Variable: #1}
 \def\Value#1{Value: #1}
 
diff --git a/sty/rdfref-user.sty b/rdfref-user.sty
similarity index 98%
rename from sty/rdfref-user.sty
rename to rdfref-user.sty
index 4d39c6ee287ba477e4f6080001835cc00ae222cc..1118ab94569c2af65522cce8b7811034af3284ab 100644
--- a/sty/rdfref-user.sty
+++ b/rdfref-user.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{rdfref-user}
-\RequirePackage{sty/rdfref-core,nameref}
+\RequirePackage{rdfref-core,nameref}
 \newwrite\exportfile
 \def\RootObject{_:doc}