Move software dirs into software dir
merge kevinp's changes into software dir