Improved organization of examples