Update project structure
New project structure screenshot