added makefile, changed files names, scanner complete