rename modules
refactor scanner