Moving files and clean up