Refactoring of project structure