Broke FeatureDetector up into smaller detector modules. Currently a lot of duplicated code.