Improve examples structure