Refactor of the feature search code.
Github bot refactoring and bitbucket bot lives