added classes,
added ressources,
Renamed vars