Restructured files in application