Development to incorporate historic renovation and utilize an infill site near downtown Oakland