re-arrange files and names