Organize files
Handle conflict