Improving object heirarchy and camera class.