move to the sdk package
Refactor naming