Perhaps during Trump’s second term he could ‘redistribute’ these offices throughout the country. Like the Bureau of Land Management Headquarters moved to Colorado and the USDA offices of the Economic Research Service (ERS) and the National Institute of Food and Agriculture (NIFA) moved to Kansas City, MO
I think breaking the government out of DC would be one of the best changes he could make. The DC bubble is a mess right now.