Change compressed files to contain 'main' module
Fix handling of tarballs and zips
Fix tests to use new compressed files