refactor + scan fixes
delete orig files