Fix more folder locations