Fixes the conflict and reorganised the cookbooks