Bower and Grunt file restructuring