Merge master into jonas.
This saves Kai half an hour of work... adjusts the folder structure.
Merge Master into jonas.