Simple package refactor for master API classes.

[Review issue ]