minor: organizing imports by package