Is Richmond, Surrey or London?

Is Richmond, Surrey or London is both historically and currently, with Richmond being historically part of Surrey but now part of London, with administrative changes explaining confusion. Richmond, specifically Richmond upon Thames, was historically part of county of Surrey, England, for centuries, as Surrey was county south of London, with Richmond being market town in Surrey, with Surrey county including Richmond until 1965. In 1965, London Government Act reorganized London, creating Greater London, and Richmond was moved from Surrey into Greater London, becoming part of London Borough of Richmond upon Thames, which is now a borough in southwest London, part of Greater London, not Surrey administratively. However, historically and culturally, many people still associate Richmond with Surrey, and postal addresses sometimes still say Surrey for tradition, and cricket county still Surrey. So Richmond is currently in London, specifically London Borough of Richmond upon Thames, part of Greater London, England, but historically was in Surrey, and ceremonially some consider it Surrey for tradition. So answer is Richmond is now in London, part of Greater London borough, but historically was in Surrey, so both are correct depending on time period, with current administrative location being London, Greater London, not Surrey, though historically Surrey.