Fix import locations (#2655)
Fix import locations (#2655)

These were causing circular references in the group call branch
matrix-org/matrix-js-sdk,matrix-org/matrix-js-sdk,matrix-org/matrix-js-sdk,matrix-org/matrix-js-sdk