Refactored session class and drivers
Small changes
Formatting changes
Updated router