added exception
renamed class