Changed files names
Changed class name