Move Links to Entities