correct mistakes and moves somes classes