Moved FormTypes to Form\Type