FlickerGenerator : refactoring of classes