Now moving files correctly