Modified organization for transition to node.js