Restructure Bower includes