rounding out changes to new layout

Refactor to the json based script setup and new context layout is now
complete. This revision works except for 8 tests on the 2011 build which
fail, need to figure those out.