move Session class
traits
reorganize collections
update core classes
housekeeping