Groups refactoring

With start of scheduled events