REFACTOR: Organize files into subdirectories