Modify DetectorFactory to support multiple factories based on different
profiles/models so more than one profile/model can be used at a time.
Also moved test classes in test source folder.