Split gi imports to be on new lines to prepare for ES modules and resolve resulting linting errors

ES modules import GI modules on individual lines, migrating current files to ES modules thus results in line shifts which then triggers new ESLint errors. The goal of this MR is to reduce the diff in !1499 (merged) and handle some of the ESLint errors before that MR.