[Androk]

I like both ideas. But folder one would probably be better, because some PWs might refuse new format of servername-filename.extension, simply because it's alot of work.

I like cheese...