fix up imports where packages cross-reference each other, only meant for my local fork