Adding Grunt & Bower, restructuring