Exit function completed with Delegation. Renaming of classes. Changes in packages.