WIP package refactor

 * fix imports