Refactoring of project