Reorganized cameras
fixes