Branch/blockly refactor

Refactors the blockly/manager property names.  Test with mars-game/blockly-refactor