Re-organizing examples in packages