Don't mix oyster shell in, it should be on the side for hens to take as needed. Don't crumble it either, ideally it should be in flakes as those bigger pieces take longer to break down in the body for better calcium absorption.
I wouldn't switch to layer at all (or maybe a 50/50 mix would...