renamed util.js to modules.js, added javascript macros