Update Insight Minor

Form types should be in Form/Type folders