Cleanup.
Cleanup.
Moved forms into the main build tree under re_gen.