(A) A nonconforming building or structure shall not be added to or enlarged in any manner, unless said 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 a building or structure is conforming as to use, but nonconforming as to yards or height or off-street parking space, said 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 said building or structure is located.
(B) No nonconforming building or structure shall be moved in whole or in part to another location on the lot unless every portion of said building or structure is made to conform to all of the regulations of the district in which it is located.