Revert "merge conflict"

This reverts commit 16053b6f64105108af9ce5632bc4a8d0221d97a0.
Revert "will revert these"

This reverts commit 70b924401df845eafe00ef79764f4640d734fbef.
Revert "renamed session class to CLI"

This reverts commit 53a6307ed999cf3e07cb1e8d89993f6b39109de3.