Adjust import paths