Better example organization