Revert Tracking modules back to stream modules

The static analyzer is reporting that the thread safety issues
with the tracking modules has been fixed so we should be able to
run these as stream modules.