Jannis

This pull request mostly gets rid of unnecessary files which got into the repo by accident.
Furthermore it just merges the WIP into master so that the basic dependencies are already incorporated.