Project structure and Class refactoring.
Class implementation was refactored.