Move src dirs into optSoftware.