[Experimental] code reorg