Add copy of what we had before the split

I've done my best to put it in a presentable state, but please check that this is really what we want.