Now using require.js for loading, reorganized file structure