Changed structure to include require.js