[017] Refacoring the project.