Fix of Main to Classes