Directory structure

Directory structure fixed (peer review with Uwe and Dominic).