Organize files better