Core and logger reorg