Merged wire-maker and electronics workshop

Consolidated the two workshops to clean up clutter.