added  expansion to dir paths