Revert "rename software directory"

This reverts commit 0021c1c6d9f0856159944f9a132b591f636dde8f.