move dependencies to right place
Make internal commands public
Update class name