Clean up configuration + Better zip file content