Move files back, nonidiomatic but cleaner