GONRG-3165: change imports to follow new code structure

3 jobs for trusted-fix/2FGONRG-3165_support_new_code_structure_comm in 2 minutes (queued for 10 seconds)