more restructuring
fixed some import statements
it runs the scan... not quite it works but close
can now do either