[CGIV-112] - Tidy cookbooks and berkshelf file