Fix incorrect import paths