New structure, using require.js