Refactor cli
Default helper load to default loader
Cleaning up api