refactoring of project structure II