Update rst package doc tree
Tidy up some minor inheritence issues