add fix to remove and create folders