Additional restructuring work. Update a few Bower components.