Adapt the new layers to caffe's new architecture