Move mako blobs seperate so it doesn't look like they came from device
Sync up with new extract-files format