Add unzip function
Delete test files
Refract code