First stages of model refactoring, and added unzip to temp folder support