moved cemetary and resevior to their own boxes.