Updates to sort the rst files into the correct directory structure on completion