Refactored node and build into 2 classes