Move Action and Model schema back into API schema