Refactoring interface of project, again