cleanup, stable reader generation
rename package