Refactoring of the project/controller structre