Organize existing files and introduce new formats