Restructured file arrangement.