Working on the node module structure refactor