renamed a bunch of files and added the scanner module