Cleaned up the api namespace in controller/views