Rename files so that they are naturally grouped together