Restructured file locations