GONRG-3165: change imports to follow new code structure

3 jobs for fix/2FGONRG-3165_support_new_code_structure_comm in 3 minutes and 32 seconds (queued for 15 seconds)