simplify detectors folder structure