Refactring dir structure.
Refactorig class names.
Refactorig class names.