Refactor of the project. A few unnecessary classes were eliminated.