Refactored the component finder stuff.