Move software dirs into software dir