Fix up toolcahin folders