More sensible layout.
Merge remote-tracking branch 'sourceforge/master'