Improving classes and refactoring organization.
New improvements.
New improvements.