Added workshop files, and fixed up Neutron a bit