Cleanup/renaming of 'docs'