Bug 934657 - [Camera] Restructuring code following model / view pattern