Reorganizing stuff and using bower more