Move files more coherently