Refactoring of project structure
Refactoring of project structure