restructured session import module