Re-arrange files