Move logic classes for import into own sub-package