Restructure and fix mimes