Refactored camera stuff into client