replace and fixed misc thing on this Locator using Corey's locator - Corey
fix Locator by using Corey's locator, fixed scanner to work with the new version, move all backup files to backup