Organizing imports - nonfunctional change