session ctrl changes - partial
modules structure improved