organized js files into different directories
Merge branch 'master' into gh-pages