reorganise, better scripts for diff and copy