session: reorganize session fields