Many adjustments, and now using bower and require.js to dependencies