Refactored nodes for a more patterened import style and fixed all tests accordingly. More reverse compat breaking changes.