refactored TankController + moved Type classes in Form\Type