renamed core to client