Add form objects (form_helper details)
Refactor file structure