Removed threader2 completely
renamed threader1 -> threader