Small reorg to tackle local imports