Changes to add FormLoader module and remove the EJB moddule