Restructured file hierarchy