Amsterdam West (nl), new estates on former waterworks site