Refactoring the parsing
Refactored the way pictures are found and parsed.