Simplify code, add new panorama packer