Refactoring the module to separate the forms into their own include files.