Move tracking modules back to stream modules

The threading issues that required these modules to be legacy have
been fixed so they can be made stream modules.