Update extract resource name so it's less generic
Add file cleanup to extract resource
Update tests
Bump version and update changelog