reorganizing sourcecode
use general sessions