Improve structure

Make the tracking registration a bit more open so plugins can use it e.g. popupviewer