Rename files and put collections into its own directory