Techplant continued, more plant models.

Also minor organization changes.