add Album.directory and Picture.file and refactor image adapters