diff --git a/build.msl b/build.msl
index 14f35ff59b41dc25724d90e01301e99c2b5e62ce..d3b36828a785be66854d2e3b72c17bb96b6f1b8d 100644
--- a/build.msl
+++ b/build.msl
@@ -21,7 +21,7 @@ log+ steximporter
 //log+ scanner
 //log+ lf
 
-extension info.kwarc.mmt.odk.GAP.GAPDocImporter
+extension info.kwarc.mmt.odk.GAP.GAPImporter
 extension info.kwarc.mmt.stex.STeXImporter
 extension info.kwarc.mmt.planetary.PlanetaryPlugin
 extension info.kwarc.mmt.planetary.PlanetaryPresenter
diff --git a/source/gap_ref_manual.xml b/gap/gap_ref_manual.xml
similarity index 100%
rename from source/gap_ref_manual.xml
rename to gap/gap_ref_manual.xml
diff --git a/lib/WApersons.tex b/lib/WApersons.tex
deleted file mode 100755
index ae7e53bbd132f3a6f22e3d9aa94b2262e22e8c34..0000000000000000000000000000000000000000
--- a/lib/WApersons.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-% A database of Persons for Metadata e.g. 
-% \WAperson[id=miko,
-% birthdate=1996-09-13,
-% email=m.kohlhase@jacobs-university.de,
-% url=http://kwarc.info/kohlhase,
-% academictitle=Dr.,
-% affiliation={Jacobs University, Bremen},
-% department=Computer Science]
-% {Michael Kohlhase}
-% A minimal example is 
-% \WAperson[id=miko]{Michael Kohlhase}
-% is also sufficient for the beginning
diff --git a/gap/compare.py b/lib/compare.py
similarity index 100%
rename from gap/compare.py
rename to lib/compare.py
diff --git a/gap/docOnlyNames.txt b/lib/docOnlyNames.txt
similarity index 100%
rename from gap/docOnlyNames.txt
rename to lib/docOnlyNames.txt
diff --git a/gap/gaptypes.g b/lib/gaptypes.g
similarity index 100%
rename from gap/gaptypes.g
rename to lib/gaptypes.g
diff --git a/gap/getNames.sh b/lib/getNames.sh
similarity index 100%
rename from gap/getNames.sh
rename to lib/getNames.sh
diff --git a/gap/namesDoc.txt b/lib/namesDoc.txt
similarity index 100%
rename from gap/namesDoc.txt
rename to lib/namesDoc.txt
diff --git a/gap/namesSys.txt b/lib/namesSys.txt
similarity index 100%
rename from gap/namesSys.txt
rename to lib/namesSys.txt
diff --git a/lib/post.tex b/lib/post.tex
deleted file mode 100755
index 2fab606060b3aed9f2c2a98dd739232779e9fcb5..0000000000000000000000000000000000000000
--- a/lib/post.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\bibliographystyle{alpha}
-\bibliography{kwarc}
-\printindex
-\end{document}
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: t
-%%% End: 
\ No newline at end of file
diff --git a/lib/pre.tex b/lib/pre.tex
deleted file mode 100644
index 7c96538bf08b1daac7026c7dba6af90a0244c28f..0000000000000000000000000000000000000000
--- a/lib/pre.tex
+++ /dev/null
@@ -1,4 +0,0 @@
-\documentclass{omdoc}
-\input{localpaths}
-\input{\MathHub{ODK/GAP/lib/preamble}}
-\begin{document}
diff --git a/lib/preamble.tex b/lib/preamble.tex
deleted file mode 100644
index 914399d08ba8203fac0a1f3b7649b7e53ff4c570..0000000000000000000000000000000000000000
--- a/lib/preamble.tex
+++ /dev/null
@@ -1,3 +0,0 @@
-\usepackage{stex}
-\usepackage[USenglish]{smultiling}
-\usepackage[bookmarks,linkcolor=black,citecolor=black,urlcolor=black,colorlinks,breaklinks,bookmarksopen,bookmarksnumbered]{hyperref}
diff --git a/gap/sharedNames.txt b/lib/sharedNames.txt
similarity index 100%
rename from gap/sharedNames.txt
rename to lib/sharedNames.txt
diff --git a/gap/sysOnlyNames.txt b/lib/sysOnlyNames.txt
similarity index 100%
rename from gap/sysOnlyNames.txt
rename to lib/sysOnlyNames.txt