Update for Dave's layout pull request

see #855

Note this removes files, please make sure they are actually removed. That can sometimes make merging hard.