Move berkshelf and librarian packages to resolver/