Docs: Merge changes from #640 into new structure