Adapted examples to the new package separation