Examples refactoring

Done.