Refactor SongsArchive::Directory