JAL-1641 remove all refs/imports from gui package