rearrange files + remove bower_components
Merge branch 'master' into gh-pages