Restructured file placement.