refactoring of project structure