Small reorganization.

Also began work on a Camera class