#488 Reorganized apiv2 views