New project structure and logic
Merge