Restructured for gulp workflow