[Form] moved types in Type folder