Refactoring Endpoint`s groups and scenes