new upstream layout - fixes #2