More conversion to require.js