Change the new app's storage format (again!)

Went from a single directory to the "files where a user wants them" approach, only to get back to the directory-based one because indexing scattered (and moving!) files would be extremely hard.