Seperated the shuffle and sublayers