Restructuring to use node-based server