Revert "Use v2 imports everywhere"

[mhemmings]

This reverts commit 7514e90.

[choran]

HI @mhemmings,
Sorry for the delay in getting back to you here. Thanks for the feedback. We are looking into this issue of how best to handle the imports. For now we will leave the imports as is while we look at the best way to approach this in future. I just wanted to check if you were still having issues using this?
I will close this PR for now as we work on this but wanted to reach out to you as well to clarify. If you are still having issues it might be best to track this as an issue in the meantime if thats ok? We can discuss approaches then in the issues. Might be easier to track there.
Thanks again
Cathal