Refactored: the three forms are now in a subpackage designed to communicate that and are named for the main model object they manipulate.