Simplified file type structure for #24