moved classes and implemented DiscoverStrategies