Change structure to grunt build without fail