Update all imports after re-structuring.