Started refactoring the project.