- Split form class to entity form and normal form
- Created form factory for each form type