should fix some circular imports
Merge pull request #2996 from digi604/fix-2994

should fix some circular imports