Reorganization of "Core" (step 6)
- Convert session handler
(Commit by Akred)