Switch to Berkshelf 3 format