Directory cleanup
Merge