PIM-1957: Move classes to avoid dependencies