Putting tracker into right package