Moved two classes from server package to common, as the Nodes will also
use these along with tracking server