-Added the new formbuilder modules and made code changes to acommodate
the new formbuilder