Refactored packagename.
Very simple custom scanner.