integrate corpus into core + reorga + better logs
rename