The agency shall comply with the obligations established under Sec. 105-8.150 by May 7, 1991; except where structural changes in facilities are undertaken, such changes shall be made by March 8, 1994, but in any event as expeditiously as possible.