Refactoring of project schema