Merge change 1571 into donut

* changes:
  Move some classes that have non ready APIs to internal packages