Added Software classes, views and tests