Renaming folders to keep them ordered