bower integration, Big refactoring