Move form builder controllers together