cleanup in imports
moved tracker functionality from LiveDataResource to TrackerResouce