Started to refactor the project.