Organize files for clarity