Added new Constructions folder, updated other files which were impacted by name changes