rename dir
merge fixes