improved filenames and added support for inidiviual picture directories