Cherry picked some bug fixes and video frame from w_maze branch
Cleaned up naming schemes and added Camera Controller directory.
Missed last time.
Merged master file changes