Refactored the forms into their own packages.