Merge "Fix: Re-structure nodejs installation"