Refactor of project