Blockly refactor

Refactors the blockly/manager property names.  Test with vwf/branch/blockly-refactor