New Refactoring of project structure