Reformat directory structure