Test directory cleanup
More zip removal
Cleanup and archiving directories