Split into require.js modules
Add note detection