#4 Constructing the panels in the Main rather than in the factories. Some renames