Refactoring forms into their own module