Adjust import to new structure