Fix dependencies; Traverse directories