Explain project structure
Fix conflicts