#5 - Refactoring of entities and project.