Reiach and Hall Architects will renovate the existing Edinburgh gallery and convert a neighbouring warehouse into a two-storey installation space by 2020. The project has "opportunities for artists and audiences at its heart", gallery Director Fiona Bradley said.