Restructuring, link highlighting/diff