refactored class names.

Also work on scan project function.