Rearranged major chunks around deployment and shell