Rework SOI parsing
Separate APP1 parsing