Refactor redstone macros
Move 'location' field to BlockNode struct