Enhancements of initial file structure