Significant refactoring of the project structure