Reorganize node spec loading