AS7-6946 Redesign web session clustering
Refactor packages.