Moved SuggestionHandler into this project