Moving software form stuff to software feature.

Signed-off-by: Joe Whitsitt <joe-whitsitt@uiowa.edu>