Cleanup

Cleaned up naming convention on controllers, routes, and views.