Fix remaining import paths