Fix more issues with files moving