finishing merging new dir structure