Licenses update
Licenses update
Better class naming