Organize files for simplicity