udpated to include files dirs