Reorganized autodoc