git: reorganize import statements

Remove unneeded imports, rewrite some unneeded .* imports. Make things look cleaner.

Signed-off-by: mkhropov <mkhropov@gmail.com>