Restructured File Structure to Standard