refactor sessions into two