reorganize container watcher, add more tracers

Signed-off-by: Matthias Bertschy <matthias.bertschy@gmail.com>