Merge "Moved SearchController into its own class."