api reorg api\core was stupid