Refactoring, start of require.js