Fixingdirs

Merging