More doco restructuring