Refactored. Added bower.