A nonconforming building or structure shall not be added to or enlarged in any manner unless the building or structure, including additions and enlargements, is made to conform to all of the regulations of the district in which it is located; provided, however, that if a building or structure is conforming as to use, but nonconforming as to yards or height or off street parking space, the building or structure may be enlarged or added to provided that the enlargement or addition complies with the yard and height and off street parking requirements of the district in which the building or structure is located. No nonconforming building or structure shall be moved in whole or in part to another location on the lot unless every portion of the building or structure is made to conform to all of the regulations of the district in which it is located. (Prior code § 16-42)