Fix up toolcahin folders again