Bower + reorganisation
Merge branch 'bower'