Moved APIs around
Moved detectors in own packages and moved other things.
Yes, and now the forgotten files.
Missing files.