Merge x2 class branches in 1
fixed error: wrong class path
renamed class folder
Merge branch 'new/class'