Cleaned up naming schemes and added Camera Controller directory.
Missed last time.