Reorder the directory structure