Redo the strnage folder structure: seems like it already would have
automatically worked.. :-/