Go back to single directory for each media type, for now