Move controllers of form building away

from main controller.js