Re-organize directories
Resolve conflicts