Refactored API view modules