Move to @mkristian's proposed layout, with some modifications.