GEOMESA-106 organizing imports