refactor session to have a feature-instance
Closes #23 (closed) #24 (closed)
This will create a new commit in order to revert the existing changes.
