!doc: Finish restructuring