Modularize node

Want it in mater asap