Reorganising a lot of things for rdoc