state: move Session lower in a source code