Camera cleanup

Started adding changes to the camera system