Project structure rafactoring