Moved GroupTemplateSelector to Picker folder