Project structure refactoring
Project structure refactoring