Refactoring of project generator