restructuring, and adding bower.json