Fix import paths