change dir names
merge