Generate Docker.io with new structure
Fixes for QEmu after adaption to Docker.io, now both works