Changed names of clases
Deleted old filed