refactor + scan fixes
delete orig files
Synchronized with source repository (bartoszlenar/dotsm).