Fix/dupe foldername

@fjvallarino please review