Reorganized for node server build