Restructured file paths