restructured CLI and setup classes
fixed specs after cli and setup class changes
Fixed bin so commands will work