Slightly improved re matching
Added a last catchall by assuming the folder name == album name (pretty common)