Initial work towards removing require.js