Side by Side: Revitalizing Urban Cores and Ensuring Residential Diversity