Check file is a valid inno file before extracting
Small amount of restructuring